Browse Source

Merge remote-tracking branch 'origin/test'

limin 7 years ago
parent
commit
b04b93e207

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

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://127.0.0.1:3306/aft20180522?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #\u5e10\u53f7
 jdbc.username=root
 #\u5bc6\u7801
@@ -86,4 +86,4 @@ ffprobe.path=/usr/bin/ffprobe
 
 video.path=test
 
-collect_flag=true
+collect_flag=true

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html

@@ -212,7 +212,7 @@
 					<a th:href="@{/portal/thinkTank/policyList?type=1}"><span class="line"></span><span>></span></a> 
 					
 				</h4>
-				<img th:src="(${policys[0].titleImg}==null or ${policys[0].titleImg} == '')?${portalHost+'/img/index/index_new2.jpg'}:${avatarUploadHost+policys[0].titleImg}" alt="">
+				<img th:src="(policys==null or ${policys[0].titleImg}==null or ${policys[0].titleImg} == '')?${portalHost+'/img/index/index_new2.jpg'}:${avatarUploadHost+policys[0].titleImg}" alt="">
 				<ul>				
 					<li th:each="p,pStatus:${policys}" th:if="${pStatus.index}==0">
 						<a th:href="@{/portal/news/newsDetail(id=${p.id},type=0)}">