Merge pull request DeemOpen#40 from daimaqiao/master

premprakashp · web-flow · commit aedf3a835ea0 · 2020-02-17T19:27:46.000-08:00
The unicode characters may be unreadable after importing
diff --git a/src/main/java/com/deem/zkui/controller/Import.java b/src/main/java/com/deem/zkui/controller/Import.java
@@ -95,7 +95,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
                 } else {
                     uploadFileName = item.getName();
-                    sbFile.append(item.getString());
+                    sbFile.append(item.getString("UTF-8"));
                 }
             }
 
@@ -112,7 +112,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             } else {
                 logger.debug("Upload file Processing " + uploadFileName);
                 dao.insertHistory((String) request.getSession().getAttribute("authName"), request.getRemoteAddr(), "Uploading File: " + uploadFileName + "<br/>" + "Overwrite: " + scmOverwrite);
-                inpStream = new ByteArrayInputStream(sbFile.toString().getBytes());
+                inpStream = new ByteArrayInputStream(sbFile.toString().getBytes("UTF-8"));
             }
 
             // open the stream and put it into BufferedReader

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)`
`95`	`95`
`96`	`96`	`} else {`
`97`	`97`	`uploadFileName = item.getName();`
`98`		`- sbFile.append(item.getString());`
	`98`	`+ sbFile.append(item.getString("UTF-8"));`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`@@ -112,7 +112,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)`
`112`	`112`	`} else {`
`113`	`113`	`logger.debug("Upload file Processing " + uploadFileName);`
`114`	`114`	`dao.insertHistory((String) request.getSession().getAttribute("authName"), request.getRemoteAddr(), "Uploading File: " + uploadFileName + "<br/>" + "Overwrite: " + scmOverwrite);`
`115`		`- inpStream = new ByteArrayInputStream(sbFile.toString().getBytes());`
	`115`	`+ inpStream = new ByteArrayInputStream(sbFile.toString().getBytes("UTF-8"));`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`// open the stream and put it into BufferedReader`