Browse Source

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

anderx 6 years ago
parent
commit
defce0feac

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

@@ -1,11 +1,11 @@
 #Driver
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#jdbc.url=jdbc:mysql://localhost:3306/jb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=dev
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20181217?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=aftdev
+jdbc.url=jdbc:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=dev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20181217?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.initialSize=3
 jdbc.maxActive=20
 jdbc.maxActive=20
@@ -38,11 +38,11 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 template.cacheable=false
 
 
-#static.host=//jb.jishutao.com/client/1.0.2
-#portal.host=//jb.jishutao.com/portal/1.0.2
+static.host=//ss.jishutao.com/client/1.2.5
+portal.host=//ss.jishutao.com/portal/1.2.5
 #本地
 #本地
-static.host=//sclient.jishutao.com:8088/client/1.0.2
-portal.host=//sportal.jishutao.com:80/portal/1.0.2
+#static.host=//sclient.jishutao.com:8088/client/1.0.2
+#portal.host=//sportal.jishutao.com:80/portal/1.0.2
 
 
 avatar.host=//ss.jishutao.com
 avatar.host=//ss.jishutao.com
 avatar.upload.host=//ss.jishutao.com/upload
 avatar.upload.host=//ss.jishutao.com/upload

+ 6 - 14
src/main/webapp/WEB-INF/views/common.html

@@ -58,10 +58,6 @@
 					<span class="webkitDown"></span>
 					<span class="webkitDown"></span>
 				</a>
 				</a>
 				<div class="xialaewm">
 				<div class="xialaewm">
-					<div class="cont_rightapps" id="iPhone">
-						<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="">
-						<p>iPhone版</p>
-					</div>
 					<div class="cont_rights android" id="Android">
 					<div class="cont_rights android" id="Android">
 						<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="">
 						<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="">
 						<p>Android版</p>
 						<p>Android版</p>
@@ -296,24 +292,20 @@
 					<div class="text_top">
 					<div class="text_top">
 						<a th:href="@{/portal/aboutUs}">关于公司/</a>
 						<a th:href="@{/portal/aboutUs}">关于公司/</a>
 						<a th:href="@{/portal/contactUs}">联系我们</a>
 						<a th:href="@{/portal/contactUs}">联系我们</a>
-						<p> Copyright &copy 2016-2017 科德 版权所有 <a href="http://www.beian.miit.gov.cn/" target="_blank">湘ICP备15019731号</a>
+						<p> Copyright &copy 2016-2020 科德 版权所有 <a href="http://www.beian.miit.gov.cn/" target="_blank">湘ICP备15019731号</a>
 							-2 技术支持:湖南阿凡提信息科技有限公司</p>
 							-2 技术支持:湖南阿凡提信息科技有限公司</p>
 					</div>
 					</div>
 					<div class="text_center">
 					<div class="text_center">
-						<div class="cont_left">
-							<img th:src="${portalHost+'/img/dizhi.jpg'}" alt=""/>
-							<p>湖南省长沙市营盘东路19号金山大厦八楼</p>
+						<div class="cont_left" style="width: 365px">
+							<img th:src="${portalHost+'/img/dizhi.jpg'}" alt="" style="margin-left: 155px;"/>
+							<p>湖南省长沙市岳麓区茶子山东路湘江财富金融中心D栋12层</p>
 						</div>
 						</div>
-						<div class="cont_center">
+						<div class="cont_center" style="margin-left: 110px;">
 							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt=""/>
 							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt=""/>
 							<p>合作电话:0731-89907207</p>
 							<p>合作电话:0731-89907207</p>
 							<p>400-8800-962</p>
 							<p>400-8800-962</p>
 						</div>
 						</div>
-						<div class="cont_rightapp">
-							<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt=""/>
-							<p>iPhone版</p>
-						</div>
-						<div class="cont_right android">
+						<div class="cont_right android"  style="margin-left: 210px;">
 							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt=""/>
 							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt=""/>
 							<p>Android版</p>
 							<p>Android版</p>
 						</div>
 						</div>

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

@@ -146,13 +146,11 @@
 			<span></span>
 			<span></span>
 		</div>
 		</div>
 		<div class="news">
 		<div class="news">
-			<div class="consultation">
-				<h4>资讯
-				 <a th:href="@{/portal/thinkTank/policyList?type=0}"><span class="line"></span><span>></span></a>
-				</h4>
-				<ul>
+			<div class="consultation"  style="width: 1200px;">
+				<a href="/portal/thinkTank/policyList?type=0" style="color: black;position: relative;left: 1120px;font-size: 16px;">更多资讯&gt;&gt;</a>
+				<ul style="display: flex; flex-wrap: wrap;">
 					
 					
-					<li th:each="n:${news}">
+					<li th:each="n:${news}" style="width: 600px;">
 						<a th:href="@{/portal/news/newsDetail(id=${n.id},type=1)}">
 						<a th:href="@{/portal/news/newsDetail(id=${n.id},type=1)}">
 							<div class="time">
 							<div class="time">
 								<span th:text="${#dates.format(n.releaseDate,'MM-dd')}">03-12</span>
 								<span th:text="${#dates.format(n.releaseDate,'MM-dd')}">03-12</span>