ソースを参照

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx 7 年 前
コミット
4769045c86

+ 5 - 18
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -271,23 +271,6 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/practicalPatent");
 		return modelview;
 	}
-	@RequestMapping(value = "/portal/continueHighApp", method = RequestMethod.GET)
-	public ModelAndView portalContinueHighApp(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/continueHighApp");
-		return modelview;
-	}
-
-	@RequestMapping(value = "/portal/militaryProjectApp", method = RequestMethod.GET)
-	public ModelAndView portalMilitaryProjectApp(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/militaryProjectApp");
-		return modelview;
-	}
-
-	@RequestMapping(value = "/portal/practicalPatentApp", method = RequestMethod.GET)
-	public ModelAndView portalPracticalPatentApp(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/practicalPatentApp");
-		return modelview;
-	}
 
 	@RequestMapping(value = "/admin/order", method = RequestMethod.GET)
 	public ModelAndView adminOrder(HttpServletRequest request, ModelAndView modelview) {
@@ -352,7 +335,11 @@ public class WebpageController extends BaseController {
 					null);
 			for (JtBusinessProject project : gaoqiList) {
 				if (project.getMinImgUrl() != null && project.getMinImgUrl().length() <= 0)
-					project.setMinImgUrl(null);
+					project.setMinImgUrl(null);
+				//去除数据中的标签
+				if(StringUtils.isNotBlank(project.getIntroduce())){
+					project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", "")); 
+				}
 			}
 			modelview.addObject("gaoqiList", gaoqiList);
 			modelview.addObject("gqc1", gaoqi);

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

@@ -53,7 +53,7 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-app.mobile.website=http://m.kedexinxi.com
+app.mobile.website=http://muat.jishutao.com
 template.cacheable=false
 
 static.host=//statics.jishutao.com/client/1.0.0

File diff suppressed because it is too large
+ 0 - 1
src/main/webapp/WEB-INF/views/portal/continueHighApp.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


File diff suppressed because it is too large
+ 0 - 1
src/main/webapp/WEB-INF/views/portal/militaryProjectApp.html


File diff suppressed because it is too large
+ 0 - 1
src/main/webapp/WEB-INF/views/portal/practicalPatentApp.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


+ 5 - 5
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -78,26 +78,26 @@
 		<div class="carousel-inner" th:each="banner,bStatus:${abannerlist}">
 			<div class="item active">
 				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
-				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
 			</div>
 		</div>
 	</div>
 	<div id="myCarousel" class="carousel slide" th:if="${#lists.size(abannerlist) > 1}">
 		<!-- 轮播(Carousel)指标 -->
 		<ol class="carousel-indicators"><!-- 循环圆点 -->
-			<li data-target="#myCarousel" data-slide-to="${bStatus.index}" class="active" th:each="banner,bStatus:${abannerlist}" th:if="${bStatus.first}"></li>
-			<li data-target="#myCarousel" data-slide-to="${bStatus.index}" th:each="banner,bStatus:${abannerlist}" th:unless="${bStatus.first}"></li>
+			<li data-target="#myCarousel" th:attr="data-slide-to=${bStatus.index}" class="active" th:each="banner,bStatus:${abannerlist}" th:if="${bStatus.first}"></li>
+			<li data-target="#myCarousel" th:attr="data-slide-to=${bStatus.index}" th:each="banner,bStatus:${abannerlist}" th:unless="${bStatus.first}"></li>
 		</ol>
 		<!-- 轮播(Carousel)项目 -->
 		<div class="carousel-inner" >
 			<div class="item active" th:each="banner,bStatus:${abannerlist}" th:if="${bStatus.first}">
 			<!-- /portal/continueHigh  /portal/militaryProject   /portal/practicalPatent -->
 				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
-				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
 			</div>
 			<div class="item" th:each="banner,bStatus:${abannerlist}" th:unless="${bStatus.first}">
 				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
-				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
 			</div>
 		</div>
 		<!-- 轮播(Carousel)导航 -->

+ 5 - 5
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -76,26 +76,26 @@
 		<div class="carousel-inner" th:each="banner,bStatus:${dbannerlist}">
 			<div class="item active">
 				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
-				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
 			</div>
 		</div>
 	</div>
 	<div id="myCarousel" class="carousel slide" th:if="${#lists.size(dbannerlist) > 1}">
 		<!-- 轮播(Carousel)指标 -->
 		<ol class="carousel-indicators"><!-- 循环圆点 -->
-			<li data-target="#myCarousel" data-slide-to="${bStatus.index}" class="active" th:each="banner,bStatus:${dbannerlist}" th:if="${bStatus.first}"></li>
-			<li data-target="#myCarousel" data-slide-to="${bStatus.index}" th:each="banner,bStatus:${dbannerlist}" th:unless="${bStatus.first}"></li>
+			<li data-target="#myCarousel" th:attr="data-slide-to=${bStatus.index}" class="active" th:each="banner,bStatus:${dbannerlist}" th:if="${bStatus.first}"></li>
+			<li data-target="#myCarousel" th:attr="data-slide-to=${bStatus.index}" th:each="banner,bStatus:${dbannerlist}" th:unless="${bStatus.first}"></li>
 		</ol>
 		<!-- 轮播(Carousel)项目 -->
 		<div class="carousel-inner" >
 			<div class="item active" th:each="banner,bStatus:${dbannerlist}" th:if="${bStatus.first}">
 			<!-- /portal/continueHigh  /portal/militaryProject   /portal/practicalPatent -->
 				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
-				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
 			</div>
 			<div class="item" th:each="banner,bStatus:${dbannerlist}" th:unless="${bStatus.first}">
 				<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
-				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
+				<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
 			</div>
 		</div>
 		<!-- 轮播(Carousel)导航 -->

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html