소스 검색

Merge remote-tracking branch 'origin/test'

Conflicts:
	src/main/java/com/goafanti/common/controller/WebpageController.java
limin 7 년 전
부모
커밋
0929b73485

+ 1 - 1
GeneratorConfig.xml

@@ -10,6 +10,6 @@
    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="jitao-server" />
    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="jitao-server" />
    <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao-server" type="XMLMAPPER" />
-   <table schema="aft" tableName="banners"/>
+   <table schema="aft" tableName="jt_commodity_comment"/>
   </context>
 </generatorConfiguration>

+ 3 - 7
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1,21 +1,17 @@
 package com.goafanti.common.controller;
 
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
-
 import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.banners.service.BannersService;
@@ -701,7 +697,7 @@ public class WebpageController extends BaseController {
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/portal/index")
 	public ModelAndView mainIndex(HttpServletRequest request, ModelAndView modelview) {
-		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
+//		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelview.setViewName("/portal/index");
 
 		List<JtBusinessCategoryBo> patentCategory = jtBusinessService.getCategoryBoList(1);
@@ -1121,7 +1117,7 @@ public class WebpageController extends BaseController {
 		return modelAndView;
 	}
 
-	private void businessHelper(ModelAndView modelAndView, String categoryName,
+/*	private void businessHelper(ModelAndView modelAndView, String categoryName,
 			List<JtBusinessCategory> jtBusinessCategories, int[] sizes) {
 		for (int i = 0; i < jtBusinessCategories.size(); i++) {
 			List<JtBusinessProject> projects = jtBusinessService
@@ -1130,7 +1126,7 @@ public class WebpageController extends BaseController {
 			modelAndView.addObject(categoryName + "List" + i, projects);
 		}
 
-	}
+	}*/
 
 	public static int differentDaysByMillisecond(Date date1, Date date2) {
 		int days = (int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24));

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserIdentityApiController.java

@@ -20,7 +20,7 @@ import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserInterestService;
 
 @RestController
-@RequestMapping(value = "/open/api/user/identity")
+@RequestMapping(value = "/api/portal/identity")
 public class UserIdentityApiController extends CertifyApiController {
 	@Resource
 	private UserIdentityService userIdentityService;

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

@@ -6,7 +6,7 @@
 <title>技淘--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/contactUs.css'}" rel="stylesheet">
-<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.0&services=true"></script>
+<!-- <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.0&services=true"></script> -->
 </head>
 <body>