From e581b9c11afb8a1c9afcc6639cd8fae954ee08ad Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Sat, 25 Mar 2017 14:25:32 +0800
Subject: [PATCH] =?UTF-8?q?thymeleaf=E7=BC=96=E7=A0=81=E4=BD=BF=E7=94=A8ut?=
 =?UTF-8?q?f-8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zheng-cms-admin/src/main/resources/springMVC-servlet.xml    | 1 +
 .../zheng-cms-web/src/main/resources/springMVC-servlet.xml      | 1 +
 .../src/main/java/com/zheng/common/base/BaseController.java     | 2 +-
 zheng-demo/src/main/resources/springMVC-servlet.xml             | 1 +
 .../zheng-upms-server/src/main/resources/springMVC-servlet.xml  | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml b/zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml
index 5e66b4a7..5c70002d 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml
@@ -40,6 +40,7 @@
 	</bean>
 	<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
 		<property name="templateEngine" ref="templateEngine"/>
+		<property name="characterEncoding" value="UTF-8"/>
 	</bean>
 
 </beans>
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml b/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml
index 3f937bae..aea3c958 100644
--- a/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml
+++ b/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml
@@ -27,6 +27,7 @@
 	</bean>
 	<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
 		<property name="templateEngine" ref="templateEngine"/>
+		<property name="characterEncoding" value="UTF-8"/>
 	</bean>
 
 </beans>
\ No newline at end of file
diff --git a/zheng-common/src/main/java/com/zheng/common/base/BaseController.java b/zheng-common/src/main/java/com/zheng/common/base/BaseController.java
index 70e7787e..fdc93672 100644
--- a/zheng-common/src/main/java/com/zheng/common/base/BaseController.java
+++ b/zheng-common/src/main/java/com/zheng/common/base/BaseController.java
@@ -49,7 +49,7 @@ public abstract class BaseController {
 	 * @return
 	 */
 	public static String jsp(String path) {
-		return path + ".jsp";
+		return path.concat(".jsp");
 	}
 
 	/**
diff --git a/zheng-demo/src/main/resources/springMVC-servlet.xml b/zheng-demo/src/main/resources/springMVC-servlet.xml
index 7a2d59f5..e2192a47 100644
--- a/zheng-demo/src/main/resources/springMVC-servlet.xml
+++ b/zheng-demo/src/main/resources/springMVC-servlet.xml
@@ -31,6 +31,7 @@
     </bean>
     <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
         <property name="templateEngine" ref="templateEngine"/>
+        <property name="characterEncoding" value="UTF-8"/>
     </bean>
 
 </beans>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml b/zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml
index 912cc6f6..e292b139 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml
+++ b/zheng-upms/zheng-upms-server/src/main/resources/springMVC-servlet.xml
@@ -36,6 +36,7 @@
     </bean>
     <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
         <property name="templateEngine" ref="templateEngine"/>
+        <property name="characterEncoding" value="UTF-8"/>
     </bean>
 
 </beans>
\ No newline at end of file