Ver código fonte

代码整合

wanghui 8 anos atrás
pai
commit
ea41f620b3

+ 2 - 5
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -244,7 +244,7 @@
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>
-		<!-- 
+
 		<if test="type != null and type != 0" >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>
@@ -253,8 +253,7 @@
 		</if>
 		<if test="keyword != null">
 			and a.title like concat('%',#{keyword},'%')
-		</if>
-		 -->
+		</if>	
 		order by create_time desc
 		<if test="page_sql != null">
 			${page_sql}
@@ -269,7 +268,6 @@
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>
-		<!-- 
 		<if test="type != null and type != 0" >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>	
@@ -279,6 +277,5 @@
 		<if test="keyword != null">
 			and a.title like concat('%',#{keyword},'%')
 		</if>
-		-->
 	</select>
 </mapper>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml

@@ -250,7 +250,7 @@
 		a.id = c.uid
 	where 
 	a.type = 1 and b.id is not null
-	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+	and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
 	<if test="locationProvince != null and locationProvince != ''">
 		and b.location_province = #{locationProvince,jdbcType=VARCHAR}
 	</if>
@@ -276,7 +276,7 @@
 		a.id = c.uid
 	where 
 	a.type = 1 and b.id is not null
-	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+	and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
 	<if test="provinceId != null and provinceId != ''">
 		and b.location_province = #{provinceId,jdbcType=VARCHAR}
 	</if>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -441,7 +441,7 @@
 		LEFT JOIN user_info info ON info.uid = u.id
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		WHERE
-			u.type = 0 and ui.audit_status=5
+			u.type = 0
 		<if test="null != level and level==1 ">
 			AND u.lvl <![CDATA[ >= ]]> 1 
 		</if>
@@ -478,7 +478,7 @@
 			LEFT JOIN user_identity ui ON ui.uid = u.id
 			LEFT JOIN user_career uc ON uc.uid = u.id
 			WHERE
-				u.type = 0 and ui.audit_status=5
+				u.type = 0 
 			<if test="null != level and level==1 ">
 				AND u.lvl <![CDATA[ >= ]]> 1 
 			</if>

+ 31 - 4
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -1,6 +1,8 @@
 package com.goafanti.portal.controller;
 
 import java.math.BigDecimal;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -13,10 +15,13 @@ import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.enums.AchievementMaturity;
 import com.goafanti.common.enums.DemandPortalSearchSignType;
 import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.enums.UserType;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.demand.service.DemandService;
+import com.goafanti.portal.bo.AchievementSearchListBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 
@@ -35,6 +40,7 @@ public class PortalSearchController extends BaseController {
 	/**
 	 * 项目搜索
 	 */
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
 	public Result achievementSearchList(  String keyword,Integer dataCategory,Integer category,
 			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice) {
@@ -57,8 +63,30 @@ public class PortalSearchController extends BaseController {
 		}catch (Exception e) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "金额"));
 		}
-		res.setData(achievementService.listAchievementSearchList( 
-				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice));
+		
+		Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList( 
+				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice);
+		
+		
+		List<AchievementSearchListBo> list = (List<AchievementSearchListBo>) achievementSearchList.getList();
+		for (int i = 0; i < list.size(); i++) {
+			Integer maturity = list.get(i).getMaturity();
+			if (null != maturity) {
+				if (AchievementMaturity.RESEARCH.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.RESEARCH.getDesc());
+				} else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.SAMPLE.getDesc());
+				} else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
+				} else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
+				} else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
+				}
+			}
+		}
+		
+		res.setData(achievementSearchList);
 		return res;
 	}
 
@@ -126,8 +154,7 @@ public class PortalSearchController extends BaseController {
 		if (UserType.PERSONAL.getCode().equals(type)) {
 			res.setData(userIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
 		} else {
-			res.setData(
-					organizationIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
+			res.setData(organizationIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
 		}
 		return res;
 	}

+ 30 - 36
src/main/resources/props/config_local.properties

@@ -1,49 +1,49 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636E\u5E93\u94FE\u63A5\uFF0C
-jdbc.url=jdbc:mysql://127.0.0.1:3306/aft_dev?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#\u5E10\u53F7
-jdbc.username=root
-#\u5BC6\u7801
+#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
+jdbc.url=jdbc:mysql://192.168.1.213:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#\u5e10\u53f7
+jdbc.username=dev
+#\u5bc6\u7801
 jdbc.password=123456
-#\u68C0\u6D4B\u6570\u636E\u5E93\u94FE\u63A5\u662F\u5426\u6709\u6548\uFF0C\u5FC5\u987B\u914D\u7F6E
+#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
-#\u521D\u59CB\u8FDE\u63A5\u6570
+#\u521d\u59cb\u8fde\u63a5\u6570
 jdbc.initialSize=3
-#\u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
 jdbc.maxActive=20
-#\u53BB\u6389\uFF0C\u914D\u7F6E\u6587\u4EF6\u5BF9\u5E94\u53BB\u6389
+#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
 #jdbc.maxIdle=20
-#\u914D\u7F6E0,\u5F53\u7EBF\u7A0B\u6C60\u6570\u91CF\u4E0D\u8DB3\uFF0C\u81EA\u52A8\u8865\u5145\u3002
+#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
 jdbc.minIdle=0
-#\u83B7\u53D6\u94FE\u63A5\u8D85\u65F6\u65F6\u95F4\u4E3A1\u5206\u949F\uFF0C\u5355\u4F4D\u4E3A\u6BEB\u79D2\u3002
+#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
 jdbc.maxWait=120000
-#\u83B7\u53D6\u94FE\u63A5\u7684\u65F6\u5019\uFF0C\u4E0D\u6821\u9A8C\u662F\u5426\u53EF\u7528\uFF0C\u5F00\u542F\u4F1A\u6709\u635F\u6027\u80FD\u3002
+#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
 jdbc.testOnBorrow=false
-#\u5F52\u8FD8\u94FE\u63A5\u5230\u8FDE\u63A5\u6C60\u7684\u65F6\u5019\u6821\u9A8C\u94FE\u63A5\u662F\u5426\u53EF\u7528\u3002
+#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
 jdbc.testOnReturn=false
-#\u6B64\u9879\u914D\u7F6E\u4E3Atrue\u5373\u53EF\uFF0C\u4E0D\u5F71\u54CD\u6027\u80FD\uFF0C\u5E76\u4E14\u4FDD\u8BC1\u5B89\u5168\u6027\u3002\u610F\u4E49\u4E3A\uFF1A\u7533\u8BF7\u8FDE\u63A5\u7684\u65F6\u5019\u68C0\u6D4B\uFF0C\u5982\u679C\u7A7A\u95F2\u65F6\u95F4\u5927\u4E8EtimeBetweenEvictionRunsMillis\uFF0C\u6267\u884CvalidationQuery\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548\u3002
+#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
 jdbc.testWhileIdle=true
-#1.Destroy\u7EBF\u7A0B\u4F1A\u68C0\u6D4B\u8FDE\u63A5\u7684\u95F4\u9694\u65F6\u95F4
-#2.testWhileIdle\u7684\u5224\u65AD\u4F9D\u636E
+#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
+#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
 jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4E00\u4E2A\u94FE\u63A5\u751F\u5B58\u7684\u65F6\u95F4\uFF08\u4E4B\u524D\u7684\u503C\uFF1A25200000\uFF0C\u8FD9\u4E2A\u65F6\u95F4\u6709\u70B9BT\uFF0C\u8FD9\u4E2A\u7ED3\u679C\u4E0D\u77E5\u9053\u662F\u600E\u4E48\u6765\u7684\uFF0C\u6362\u7B97\u540E\u7684\u7ED3\u679C\u662F\uFF1A25200000/1000/60/60 = 7\u4E2A\u5C0F\u65F6\uFF09
+#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
 jdbc.minEvictableIdleTimeMillis=300000
-#\u94FE\u63A5\u4F7F\u7528\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u662F\u5426\u56DE\u6536
+#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
 jdbc.removeAbandoned=true
-#\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u65F6\u95F4\uFF08\u5355\u4F4D\u79D2\uFF09\uFF0C\u76EE\u524D\u4E3A5\u5206\u949F\uFF0C\u5982\u679C\u6709\u4E1A\u52A1\u5904\u7406\u65F6\u95F4\u8D85\u8FC75\u5206\u949F\uFF0C\u53EF\u4EE5\u9002\u5F53\u8C03\u6574\u3002
+#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
 jdbc.removeAbandonedTimeout=300
-#\u94FE\u63A5\u56DE\u6536\u7684\u65F6\u5019\u63A7\u5236\u53F0\u6253\u5370\u4FE1\u606F\uFF0C\u6D4B\u8BD5\u73AF\u5883\u53EF\u4EE5\u52A0\u4E0Atrue\uFF0C\u7EBF\u4E0A\u73AF\u5883false\u3002\u4F1A\u5F71\u54CD\u6027\u80FD\u3002
+#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
 jdbc.logAbandoned=true
-#\u7EDF\u8BA1\u76D1\u63A7
+#\u7edf\u8ba1\u76d1\u63a7
 jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=127.0.0.1
+jedis.host=192.168.1.213
 jedis.port=6379
 jedis.timeout=5000
-jedis.password=123456
+jedis.password=aft123456
 
 pwd.hash_algorithm_name=md5
 pwd.hash_iterations=2
@@ -52,29 +52,23 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
+template.cacheable=false
 
-static.host=//afts.hnzhiming.com/1.0.44
+static.host=//sb.jishutao.com/1.0.43
+portal.host=//sf.jishutao.com/portal/2.0.0
+avatar.host=//sb.jishutao.com
+avatar.upload.host=//sb.jishutao.com/upload
 
-upload.path=/Users/xiaolong/Sites/upload
-upload.private.path=/Users/xiaolong/Sites/doc
+upload.path=E:/data/public/upload
+upload.private.path=E:/data/private/upload
 
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
-
-avatar.host=//afts.hnzhiming.com
-
 aesSecretKey=aft1234567890123
 
-template.cacheable=false
-
 mobileCodeTemplate=SMS_37845022
-
-portal.host=//afts.hnzhiming.com/portal/2.0.0
-
 patentTemplate=SMS_72005286
 
-avatar.upload.host=//afts.hnzhiming.com/upload
-
 easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
 easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE

Diferenças do arquivo suprimidas por serem muito extensas
+ 5 - 8
src/main/webapp/WEB-INF/views/common.html


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

@@ -14,16 +14,12 @@
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt="" /></a></li>
-			<li data-index=1><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt="" /></a></li>
-			<li data-index=2><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt="" /></a></li>
-			<li data-index=3><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt="" /></a></li>
-			<li data-index=4><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt="" /></a></li>
+			<li data-index=0><img
+					th:src="${portalHost + '/img/financial_banner01.jpg'}" alt="" /></li>
+			<li data-index=1><img
+					th:src="${portalHost + '/img/financial_banner01.jpg'}" alt="" /></li>
+			<li data-index=2><img
+					th:src="${portalHost + '/img/financial_banner01.jpg'}" alt="" /></li>
 		</ul>
 		<a class="btn btn-next" href=""> <img
 			th:src="${portalHost + '/img/index_next.png'}" alt="" />
@@ -246,27 +242,6 @@
 		<div class="allproduct_bottom">
 			<div class="allproduct_cont">
 				<ul id="demandList_patent">
-					<li><img src="../img/allproduct_img.png" alt="" />
-						<div class="details_text">
-							<p>
-								融资金额: <span>10000</span>
-							</p>
-							<p>
-								所属行业: <span>航海航空</span>
-							</p>
-							<p>
-								所 有 人 : <span>海泽王</span>
-							</p>
-							<p>
-								项目简介: <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b>
-							</p>
-							<a href="#">会谈</a>
-						</div>
-						<div class="details_fix">
-							<p>
-								项目名 <span> 医疗四分局王死哦风景</span>
-							</p>
-						</div></li>
 				</ul>
 			</div>
 			<div class="pagination_box">

+ 2 - 6
src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html

@@ -33,9 +33,7 @@
 	            <ul class="detail_toptitle">
 	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
 	            	<li>></li>
-	                <li><a href="#">科技金融 </a></li>
-	                <li>></li>               
-	                <li><a href="#">我要找资金  </a></li>
+	                <li><a href="#">科技金融 </a></li>	                
 	                <li>></li>
 	                <li class="that"><a href="#" >投资机构 </a></li>
 	            </ul>
@@ -50,9 +48,7 @@
 					</div>					
 					<div class="searchs">
 		 				<div class="select">
-		 					<select name="" id="selt">
-		 											
-		 					</select>	 					
+		 					搜一搜 					
 		 				</div> 				
 		 				<div id="search_on">					
 		 					<input type="search" placeholder="高新"/>

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

@@ -13,11 +13,9 @@
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/index_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/index_banner02.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/index_banner03.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
@@ -209,19 +207,19 @@
 						</li>
 						<li>
 							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf'}">
-								<img th:src="${portalHost+'/img/need_img3.jpg'}" alt="" />
+								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />
 								<p>高性能铅炭电池</p>
 							</a>
 						</li>
 						<li>
 							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9'}">
-								<img th:src="${portalHost+'/img/need_img4.jpg'}" alt="" />
+								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>ABS板材改性工程塑料的配方及研究</p>
 							</a>
 						</li>
 						<li>
 							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d'}">
-								<img th:src="${portalHost+'/img/need_img5.jpg'}" alt="" />
+								<img th:src="${portalHost+'/img/need_img3.jpg'}" alt="" />
 								<p>机械领域新型产品或技术</p>
 							</a>
 						</li>

+ 0 - 2
src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html

@@ -16,8 +16,6 @@
 			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_1.jpg'}" alt=""/></a></li>
 			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_2.jpg'}" alt=""/></a></li>
 			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_5.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>

+ 3 - 5
src/main/webapp/WEB-INF/views/portal/service/propertyRight.html

@@ -13,11 +13,9 @@
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/property_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/property_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/property_banner01.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>

Diferenças do arquivo suprimidas por serem muito extensas
+ 13 - 89
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


+ 3 - 5
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -14,11 +14,9 @@
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
+			<li data-index=1 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
+			<li data-index=2 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>