Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb 8 years ago
parent
commit
7ec35f6301

+ 2 - 2
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.36
+static.host=//afts.hnzhiming.com/1.0.37
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload
@@ -67,7 +67,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.4
+portal.host=//afts.hnzhiming.com/portal/1.0.5
 
 patentTemplate=SMS_72005286
 

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.36
+static.host=//afts.hnzhiming.com/1.0.37
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc
@@ -69,7 +69,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.4
+portal.host=//afts.hnzhiming.com/portal/1.0.5
 
 patentTemplate=SMS_72005286
 

+ 2 - 2
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.36
+static.host=//aftts.hnzhiming.com/1.0.37
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload
@@ -69,7 +69,7 @@ template.cacheable=true
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//aftts.hnzhiming.com/portal/1.0.4
+portal.host=//aftts.hnzhiming.com/portal/1.0.5
 
 patentTemplate=SMS_72005286
 

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html

@@ -52,8 +52,8 @@
 					<img  th:if="${lecture.lectureUrl} != null" th:src="${avatarUploadHost + lecture.lectureUrl}">
 					</div>
 					<div class="lecture_content_info">
-						<h4 th:text="${lecture.name}" th:title="${lecture.name}">张泽院士的讲堂</h4>
-						<p th:text="${lecture.summary}" th:title="${lecture.summary}">关于从事准晶结构及其向晶体雷声变的中间过程和准晶中的缺陷的研究</p>
+						<h4 th:text="${lecture.name}" th:title="${lecture.name}"></h4>
+						<p th:text="${lecture.summary}" th:title="${lecture.summary}"></p>
 						<p th:text="${lecture.lectureTimeFormattedDate}" th:title="${lecture.lectureTimeFormattedDate}">2017-07-02 09:30:00</p>
 						<span class="customer-service">报名中</span>
 					</div>