Skip to content

Commit b5f0966

Browse files
author
Arjun Surendra
authored
Merge pull request DeemOpen#20 from divyeshtopiya/master
fix: special char is not being saved or shown, set charset=UTF-8 in a…
2 parents 656c223 + 4e0b8e7 commit b5f0966

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/main/java/com/deem/zkui/controller/Export.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
6060
for (LeafBean leaf : leaves) {
6161
output.append(leaf.getPath()).append('=').append(leaf.getName()).append('=').append(ServletUtil.INSTANCE.externalizeNodeValue(leaf.getValue())).append('\n');
6262
}// for all leaves
63-
response.setContentType("text/plain");
63+
response.setContentType("text/plain;charset=UTF-8");
6464
try (PrintWriter out = response.getWriter()) {
6565
out.write(output.toString());
6666
}

src/main/java/com/deem/zkui/controller/RestAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
156156

157157
}
158158

159-
response.setContentType("text/plain");
159+
response.setContentType("text/plain;charset=UTF-8");
160160
try (PrintWriter out = response.getWriter()) {
161161
out.write(resultOut.toString());
162162
}

src/main/java/com/deem/zkui/utils/ServletUtil.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public void renderHtml(HttpServletRequest request, HttpServletResponse response,
5555
templateParam.put("authName", session.getAttribute("authName"));
5656
templateParam.put("authRole", session.getAttribute("authRole"));
5757

58-
response.setContentType("text/html");
58+
response.setContentType("text/html;charset=UTF-8");
59+
5960
Template template = null;
6061
long startTime = System.currentTimeMillis();
6162
Configuration config = new Configuration();
@@ -74,7 +75,7 @@ public void renderError(HttpServletRequest request, HttpServletResponse response
7475
try {
7576
logger.error("Error :" + error);
7677
Map<String, Object> templateParam = new HashMap<>();
77-
response.setContentType("text/html");
78+
response.setContentType("text/html;charset=UTF-8");
7879
Template template = null;
7980
Configuration config = new Configuration();
8081
config.setClassForTemplateLoading(request.getServletContext().getClass(), "/");

0 commit comments

Comments
 (0)