Quellcode durchsuchen

Merge branch 'test' of jishutao/jitao-server into prod

anderx vor 3 Jahren
Ursprung
Commit
e91b75bd1b

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

@@ -40,7 +40,7 @@ template.cacheable=false
 
 
 static.host=//ss.jishutao.com/client/1.2.11
 static.host=//ss.jishutao.com/client/1.2.11
 #portal.host=//ss.jishutao.com/portal/1.2.17
 #portal.host=//ss.jishutao.com/portal/1.2.17
-portal.host=//statics.jishutao.com/portal/1.2.18
+portal.host=//statics.jishutao.com/portal/1.2.19
 skjt.host=//ss.jishutao.com/skjt/1.3
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
 
 

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

@@ -57,7 +57,7 @@ app.mobile.website=http://muat.jishutao.com
 template.cacheable=false
 template.cacheable=false
 
 
 static.host=//statics.jishutao.com/client/1.2.7
 static.host=//statics.jishutao.com/client/1.2.7
-portal.host=//statics.jishutao.com/portal/1.2.17
+portal.host=//statics.jishutao.com/portal/1.2.19
 skjt.host=//statics.jishutao.com/skjt/1.3
 skjt.host=//statics.jishutao.com/skjt/1.3
 skjt.userName=admin
 skjt.userName=admin
 skjt.password=asd123..
 skjt.password=asd123..

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

@@ -130,12 +130,20 @@
 							<span class="newapply_ltxt">技术信息舆情</span>
 							<span class="newapply_ltxt">技术信息舆情</span>
 						</div>
 						</div>
 					</a>
 					</a>
-					<a href="https://www.ebaoquan.org/">
+<!--					<a href="https://www.ebaoquan.org/">-->
+<!--						<div class="newapply_listitem">-->
+<!--							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/jsjybz.png'}" alt="" />-->
+<!--							<span class="newapply_ltxt">技术交易保障</span>-->
+<!--						</div>-->
+<!--					</a>-->
+
+					<a href="http://140.210.193.73/login">
 						<div class="newapply_listitem">
 						<div class="newapply_listitem">
-							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/jsjybz.png'}" alt="" />
-							<span class="newapply_ltxt">技术交易保障</span>
+							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/zhcqdn.png'}" alt="" />
+							<span class="newapply_ltxt">智慧产权大脑</span>
 						</div>
 						</div>
 					</a>
 					</a>
+
 					<a th:href="@{/portal/evaluation/evaluate}">
 					<a th:href="@{/portal/evaluation/evaluate}">
 						<div class="newapply_listitem">
 						<div class="newapply_listitem">
 							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/gqzx.png'}" alt="" />
 							<img class="newapply_licon" th:src="${portalHost+'/img/newapply/gqzx.png'}" alt="" />
@@ -237,7 +245,7 @@
 	<!-- 20年经验 -->
 	<!-- 20年经验 -->
 	<div class="newbanner">
 	<div class="newbanner">
 		<img class="newbanner_img" th:src="${portalHost+'/img/newbanner/bg.png'}" alt="" />
 		<img class="newbanner_img" th:src="${portalHost+'/img/newbanner/bg.png'}" alt="" />
-		<div class="newbanner_large">20年知识产权运用经验&nbsp;&nbsp;&nbsp;拥有咨询业甲级资质</div>
+		<div class="newbanner_large">22年知识产权运用经验&nbsp;&nbsp;&nbsp;拥有咨询业甲级资质</div>
 		<div class="newbanner_small">国家高新技术企业&nbsp;&nbsp;&nbsp;国家技术转移示范机构</div>
 		<div class="newbanner_small">国家高新技术企业&nbsp;&nbsp;&nbsp;国家技术转移示范机构</div>
 	</div>
 	</div>