fix csv load error

wh1t3p1g · wh1t3p1g · commit 6d90e5b60f54 · 2024-06-13T23:21:52.000+08:00
diff --git a/src/main/java/tabby/common/bean/converter/List2JsonStringConverter.java b/src/main/java/tabby/common/bean/converter/List2JsonStringConverter.java
@@ -1,10 +1,10 @@
 package tabby.common.bean.converter;
 
 import com.google.gson.reflect.TypeToken;
-import tabby.config.GlobalConfiguration;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
+import tabby.common.utils.JsonUtils;
+
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +22,7 @@ public String convertToDatabaseColumn(List<String> attribute) {
             return "";
         }
 
-        return GlobalConfiguration.GSON.toJson(attribute);
+        return JsonUtils.toJson(attribute);
     }
 
     @Override
@@ -31,6 +31,6 @@ public List<String> convertToEntityAttribute(String dbData) {
             return new ArrayList<>();
         }
         Type objectType = new TypeToken<List<String>>(){}.getType();
-        return GlobalConfiguration.GSON.fromJson(dbData, objectType);
+        return JsonUtils.fromJson(dbData, objectType);
     }
 }
diff --git a/src/main/java/tabby/common/bean/converter/ListInteger2JsonStringConverter.java b/src/main/java/tabby/common/bean/converter/ListInteger2JsonStringConverter.java
@@ -1,10 +1,10 @@
 package tabby.common.bean.converter;
 
 import com.google.gson.reflect.TypeToken;
-import tabby.config.GlobalConfiguration;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
+import tabby.common.utils.JsonUtils;
+
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +22,7 @@ public String convertToDatabaseColumn(List<Integer> attribute) {
             return "";
         }
 
-        return GlobalConfiguration.GSON.toJson(attribute);
+        return JsonUtils.toJson(attribute);
     }
 
     @Override
@@ -31,6 +31,6 @@ public List<Integer> convertToEntityAttribute(String dbData) {
             return new ArrayList<>();
         }
         Type objectType = new TypeToken<List<Integer>>(){}.getType();
-        return GlobalConfiguration.GSON.fromJson(dbData, objectType);
+        return JsonUtils.fromJson(dbData, objectType);
     }
 }
diff --git a/src/main/java/tabby/common/bean/converter/ListSet2JsonStringConverter.java b/src/main/java/tabby/common/bean/converter/ListSet2JsonStringConverter.java
@@ -1,10 +1,10 @@
 package tabby.common.bean.converter;
 
 import com.google.gson.reflect.TypeToken;
-import tabby.config.GlobalConfiguration;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
+import tabby.common.utils.JsonUtils;
+
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +23,7 @@ public String convertToDatabaseColumn(List<Set<String>> attribute) {
             return "";
         }
 
-        return GlobalConfiguration.GSON.toJson(attribute);
+        return JsonUtils.toJson(attribute);
     }
 
     @Override
@@ -32,6 +32,6 @@ public List<Set<String>> convertToEntityAttribute(String dbData) {
             return new ArrayList<>();
         }
         Type objectType = new TypeToken<List<Set<String>>>(){}.getType();
-        return GlobalConfiguration.GSON.fromJson(dbData, objectType);
+        return JsonUtils.fromJson(dbData, objectType);
     }
 }
diff --git a/src/main/java/tabby/common/bean/converter/Map2JsonStringConverter.java b/src/main/java/tabby/common/bean/converter/Map2JsonStringConverter.java
@@ -1,10 +1,10 @@
 package tabby.common.bean.converter;
 
 import com.google.gson.reflect.TypeToken;
-import tabby.config.GlobalConfiguration;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
+import tabby.common.utils.JsonUtils;
+
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
@@ -21,7 +21,7 @@ public String convertToDatabaseColumn(Map<String, String> attribute) {
         if(attribute == null){
             return "{}";
         }
-        return GlobalConfiguration.GSON.toJson(attribute);
+        return JsonUtils.toJson(attribute);
     }
 
     @Override
@@ -30,6 +30,6 @@ public Map<String, String> convertToEntityAttribute(String dbData) {
             return new HashMap<>();
         }
         Type objectType = new TypeToken<Map<String, String>>(){}.getType();
-        return GlobalConfiguration.GSON.fromJson(dbData, objectType);
+        return JsonUtils.fromJson(dbData, objectType);
     }
 }
diff --git a/src/main/java/tabby/common/bean/converter/Map2JsonStringForAnnotationsConverter.java b/src/main/java/tabby/common/bean/converter/Map2JsonStringForAnnotationsConverter.java
@@ -1,10 +1,10 @@
 package tabby.common.bean.converter;
 
 import com.google.gson.reflect.TypeToken;
-import tabby.config.GlobalConfiguration;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
+import tabby.common.utils.JsonUtils;
+
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +23,8 @@ public String convertToDatabaseColumn(Map<String, Map<String, Set<String>>> attr
         if(attribute == null){
             return "{}";
         }
-        return GlobalConfiguration.GSON.toJson(attribute);
+
+        return JsonUtils.toJsonWithReplace(attribute);
     }
 
     @Override
@@ -32,6 +33,6 @@ public Map<String, Map<String, Set<String>>> convertToEntityAttribute(String dbD
             return new HashMap<>();
         }
         Type objectType = new TypeToken<Map<String, Map<String, Set<String>>>>(){}.getType();
-        return new ConcurrentHashMap<>(GlobalConfiguration.GSON.fromJson(dbData, objectType));
+        return new ConcurrentHashMap<>(JsonUtils.fromJson(dbData, objectType));
     }
 }
diff --git a/src/main/java/tabby/common/utils/JsonUtils.java b/src/main/java/tabby/common/utils/JsonUtils.java
@@ -0,0 +1,41 @@
+package tabby.common.utils;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+
+import java.lang.reflect.Type;
+
+/**
+ * 为了解决 csv "" \" 同时存在时，可能导致的解析报错
+ * @author wh1t3p1g
+ * @project tabby
+ * @since 2024/3/23
+ */
+public class JsonUtils {
+
+    public static Gson GSON = new GsonBuilder().disableHtmlEscaping().create();
+
+    public static String toJson(Object obj){
+        return GSON.toJson(obj);
+    }
+
+    public static  <T> T fromJson(String json, Type typeOfT) throws JsonSyntaxException {
+        return GSON.fromJson(json, typeOfT);
+    }
+
+    /**
+     * 为了解决 csv "" \" 同时存在时，可能导致的解析报错
+     * @param obj
+     * @return
+     */
+    public static String toJsonWithReplace(Object obj){
+        String data = GSON.toJson(obj);
+        return data.replace("\\", "\\\\");
+    }
+
+    public static  <T> T fromJsonWithReplace(String json, Type typeOfT) throws JsonSyntaxException {
+        json = json.replace("\\\\", "\\");
+        return GSON.fromJson(json, typeOfT);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`package tabby.common.bean.converter;`
`2`	`2`
`3`	`3`	`import com.google.gson.reflect.TypeToken;`
`4`		`-import tabby.config.GlobalConfiguration;`
`5`		`-`
`6`	`4`	`import jakarta.persistence.AttributeConverter;`
`7`	`5`	`import jakarta.persistence.Converter;`
	`6`	`+import tabby.common.utils.JsonUtils;`
	`7`	`+`
`8`	`8`	`import java.lang.reflect.Type;`
`9`	`9`	`import java.util.ArrayList;`
`10`	`10`	`import java.util.List;`
`@@ -22,7 +22,7 @@ public String convertToDatabaseColumn(List<String> attribute) {`
`22`	`22`	`return "";`
`23`	`23`	`}`
`24`	`24`
`25`		`- return GlobalConfiguration.GSON.toJson(attribute);`
	`25`	`+ return JsonUtils.toJson(attribute);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
`@@ -31,6 +31,6 @@ public List<String> convertToEntityAttribute(String dbData) {`
`31`	`31`	`return new ArrayList<>();`
`32`	`32`	`}`
`33`	`33`	`Type objectType = new TypeToken<List<String>>(){}.getType();`
`34`		`- return GlobalConfiguration.GSON.fromJson(dbData, objectType);`
	`34`	`+ return JsonUtils.fromJson(dbData, objectType);`
`35`	`35`	`}`
`36`	`36`	`}`