From d89f742877d6e22c19f16aa08ec7219c3283606d Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Thu, 23 Mar 2017 17:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0thymeleaf=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E5=92=8C=E8=BF=9C=E7=A8=8Bzheng-ui=E9=9D=99=E6=80=81=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E8=A7=86=E5=9B=BE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config.properties      |  1 +
 .../main/resources/profiles/dev.properties    |  1 +
 .../main/resources/profiles/pre.properties    |  1 +
 .../main/resources/profiles/prod.properties   |  1 +
 .../main/resources/profiles/test.properties   |  1 +
 .../src/main/resources/springMVC-servlet.xml  | 30 +++++++++++++++----
 .../src/main/resources/config.properties      |  1 +
 .../main/resources/profiles/dev.properties    |  1 +
 .../main/resources/profiles/pre.properties    |  1 +
 .../main/resources/profiles/prod.properties   |  1 +
 .../main/resources/profiles/test.properties   |  1 +
 .../src/main/resources/springMVC-servlet.xml  | 30 +++++++++++++++----
 .../src/main/resources/config.properties      |  1 +
 .../main/resources/profiles/dev.properties    |  3 +-
 .../main/resources/profiles/pre.properties    |  3 +-
 .../main/resources/profiles/prod.properties   |  3 +-
 .../main/resources/profiles/test.properties   |  3 +-
 .../src/main/resources/springMVC-servlet.xml  | 24 +++++++++++++--
 18 files changed, 88 insertions(+), 19 deletions(-)

diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties
index d2404f13..6bf262a1 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties
@@ -1,4 +1,5 @@
 env=${profile.env}
 zheng-ui.version=${zheng-ui.version}
+zheng-ui.path=${zheng-ui.path}
 ### activeMq
 AvtiveMQ.brokerURL=${AvtiveMQ.brokerURL}
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties
index 7f3b2bdd..b9967565 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties
@@ -1,4 +1,5 @@
 profile.env=dev
 zheng-ui.version=1.0.0
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties
index eadbd8f1..e6c02a17 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties
@@ -1,4 +1,5 @@
 profile.env=pre
 zheng-ui.version=1.0.0
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties
index 5a28d305..3316e0b6 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties
@@ -1,4 +1,5 @@
 profile.env=prod
 zheng-ui.version=1.0.0
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties
index cd220125..07fac2d2 100644
--- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties
+++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties
@@ -1,4 +1,5 @@
 profile.env=test
 zheng-ui.version=1.0.0
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
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 3a745939..5e66b4a7 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
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="
-        http://www.springframework.org/schema/beans
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:mvc="http://www.springframework.org/schema/mvc"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<!-- 根目录'/'对应页面 -->
-	<mvc:view-controller path="/" view-name="/index"/>
+	<mvc:view-controller path="/" view-name="/index.jsp"/>
 
 	<!-- 拦截器配置 -->
 	<mvc:interceptors>
@@ -24,4 +24,22 @@
 		</mvc:interceptor>
 	</mvc:interceptors>
 
+	<context:property-placeholder location="classpath:config.properties"/>
+
+	<!-- 使用thymeleaf视图 -->
+	<bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
+		<property name="order" value="0"/>
+		<property name="prefix" value="${zheng-ui.path}"/>
+		<property name="suffix" value=".html"/>
+		<property name="templateMode" value="HTML"/>
+		<property name="cacheable" value="false"/>
+	</bean>
+	<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
+		<property name="templateResolver" ref="templateResolver"/>
+		<property name="enableSpringELCompiler" value="true"/>
+	</bean>
+	<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
+		<property name="templateEngine" ref="templateEngine"/>
+	</bean>
+
 </beans>
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-web/src/main/resources/config.properties b/zheng-cms/zheng-cms-web/src/main/resources/config.properties
index 24891f60..cf68f756 100644
--- a/zheng-cms/zheng-cms-web/src/main/resources/config.properties
+++ b/zheng-cms/zheng-cms-web/src/main/resources/config.properties
@@ -1,2 +1,3 @@
 env=${profile.env}
+zheng-ui.path=${zheng-ui.path}
 ehcache.name=zheng-cms-ehcache
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties b/zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties
index a66e9ee5..a4e00f02 100644
--- a/zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties
+++ b/zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties
@@ -1,3 +1,4 @@
 profile.env=dev
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-web/src/main/resources/profiles/pre.properties b/zheng-cms/zheng-cms-web/src/main/resources/profiles/pre.properties
index c57e9fd6..d5a8dbf6 100644
--- a/zheng-cms/zheng-cms-web/src/main/resources/profiles/pre.properties
+++ b/zheng-cms/zheng-cms-web/src/main/resources/profiles/pre.properties
@@ -1,3 +1,4 @@
 profile.env=pre
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties b/zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties
index 8ba8b905..437c9aa6 100644
--- a/zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties
+++ b/zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties
@@ -1,3 +1,4 @@
 profile.env=prod
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ No newline at end of file
diff --git a/zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties b/zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties
index 874ace69..1dda2481 100644
--- a/zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties
+++ b/zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties
@@ -1,3 +1,4 @@
 profile.env=test
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
 ### activeMq
 AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)
\ 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 1aaa7fc3..3f937bae 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
@@ -1,14 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="
-        http://www.springframework.org/schema/beans
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:mvc="http://www.springframework.org/schema/mvc"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<!-- 根目录'/'对应页面 -->
-	<mvc:view-controller path="/" view-name="/index"/>
+	<mvc:view-controller path="/" view-name="/index.jsp"/>
+
+	<context:property-placeholder location="classpath:config.properties"/>
+
+	<!-- 使用thymeleaf视图 -->
+	<bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
+		<property name="order" value="0"/>
+		<property name="prefix" value="${zheng-ui.path}"/>
+		<property name="suffix" value=".html"/>
+		<property name="templateMode" value="HTML"/>
+		<property name="cacheable" value="false"/>
+	</bean>
+	<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
+		<property name="templateResolver" ref="templateResolver"/>
+		<property name="enableSpringELCompiler" value="true"/>
+	</bean>
+	<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
+		<property name="templateEngine" ref="templateEngine"/>
+	</bean>
 
 </beans>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/config.properties b/zheng-upms/zheng-upms-server/src/main/resources/config.properties
index 47a8063d..4e2c5242 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/config.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/config.properties
@@ -1,2 +1,3 @@
 env=${profile.env}
+zheng-ui.path=${zheng-ui.path}
 zheng-ui.version=${zheng-ui.version}
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties
index 05de9162..bfe5b9b1 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties
@@ -1,2 +1,3 @@
 profile.env=dev
-zheng-ui.version=1.0.0
\ No newline at end of file
+zheng-ui.version=1.0.0
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties
index 0ecf3f89..f88ed98f 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties
@@ -1,2 +1,3 @@
 profile.env=pre
-zheng-ui.version=1.0.0
\ No newline at end of file
+zheng-ui.version=1.0.0
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties
index 63aa8440..419e8761 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties
@@ -1,2 +1,3 @@
 profile.env=prod
-zheng-ui.version=1.0.0
\ No newline at end of file
+zheng-ui.version=1.0.0
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties
index c2eaebb4..bee06b27 100644
--- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties
+++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties
@@ -1,2 +1,3 @@
 profile.env=test
-zheng-ui.version=1.0.0
\ No newline at end of file
+zheng-ui.version=1.0.0
+zheng-ui.path=http://ui.zhangshuzheng.cn:1000/
\ 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 592ce7b5..912cc6f6 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
@@ -2,11 +2,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
     <!-- 根目录'/'对应页面 -->
     <mvc:view-controller path="/" view-name="/index.jsp"/>
@@ -20,4 +20,22 @@
         </mvc:interceptor>
     </mvc:interceptors>
 
+    <context:property-placeholder location="classpath:config.properties"/>
+
+    <!-- 使用thymeleaf视图 -->
+    <bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
+        <property name="order" value="0"/>
+        <property name="prefix" value="${zheng-ui.path}"/>
+        <property name="suffix" value=".html"/>
+        <property name="templateMode" value="HTML"/>
+        <property name="cacheable" value="false"/>
+    </bean>
+    <bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
+        <property name="templateResolver" ref="templateResolver"/>
+        <property name="enableSpringELCompiler" value="true"/>
+    </bean>
+    <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
+        <property name="templateEngine" ref="templateEngine"/>
+    </bean>
+
 </beans>
\ No newline at end of file