Merge branch 'stage_tsit' into card007

src/main/java/com/style24/front/biz/thirdparty/SearchEngineDiquest.java

@@ -78,15 +78,15 @@ public class SearchEngineDiquest {
 		Map<String, Object> paramMap = new HashMap<String, Object>();
 		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
-		log.info("///[getTrendKeywordList] paramMap: {}", paramMap);
+		//log.info("///[getTrendKeywordList] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = AutoSearch.trendKeyword(paramMap);
-			log.info("///[getTrendKeywordList] jsonObj: {}", jsonObj.toJSONString());
+			//log.info("///[getTrendKeywordList] jsonObj: {}", jsonObj.toJSONString());
 
 			Gson gson = new Gson();
 			result = gson.fromJson(jsonObj.toJSONString(), SearchEngine.class);
-			log.info("///[getTrendKeywordList] result: {}", result);
+			//log.info("///[getTrendKeywordList] result: {}", result);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -108,17 +108,17 @@ public class SearchEngineDiquest {
 		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
-		log.info("///[getAutoComplete] paramMap: {}", paramMap);
+		//log.info("///[getAutoComplete] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = new JSONObject();
 			jsonObj = AutoSearch.getAutoComplete(paramMap);
 			
-			log.info("///[getAutoComplete] jsonObj: {}", jsonObj.toJSONString());
+			//log.info("///[getAutoComplete] jsonObj: {}", jsonObj.toJSONString());
 
 			Gson gson = new Gson();
 			result = gson.fromJson(jsonObj.toJSONString(), AutoCompleteResponse.class);
-			log.info("///[getAutoComplete] result: {}", result);
+			//log.info("///[getAutoComplete] result: {}", result);
 		} catch (Exception e) {
 			//e.printStackTrace();
 		}
@@ -149,18 +149,18 @@ public class SearchEngineDiquest {
 		if (params.getBrandGroupNo() > 0) {
 			paramMap.put("defaultCateYn", displayDao.getBrandGroupDefaultCategoryYn(params.getBrandGroupNo()));
 		}
-		log.info("///[getCategoryList] paramMap: {}", paramMap);
+		//log.info("///[getCategoryList] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = SearchService.getCategoryGoodsList(paramMap);
-			log.info("///[getCategoryList] jsonObj: {}", jsonObj.toJSONString());
+			//log.info("///[getCategoryList] jsonObj: {}", jsonObj.toJSONString());
 
 			Gson gson = new Gson();
 			CateResponse response = gson.fromJson(jsonObj.toJSONString(), CateResponse.class);
 
 			if (jsonObj.get("returnCode").toString().equals("1")) { // 성공
 				result = response.getResponse();
-				log.info("///[getCategoryList] result: {}", result);
+				//log.info("///[getCategoryList] result: {}", result);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -182,18 +182,18 @@ public class SearchEngineDiquest {
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
 		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
-		log.info("///[getFilterList] paramMap: {}", paramMap);
+		//log.info("///[getFilterList] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = SearchService.getFilterList(paramMap);
-			log.info("///[getFilterList] jsonObj: {}", jsonObj.toJSONString());
+			//log.info("///[getFilterList] jsonObj: {}", jsonObj.toJSONString());
 
 			Gson gson = new Gson();
 			FilterResponse response = gson.fromJson(jsonObj.toJSONString(), FilterResponse.class);
 
 			if (jsonObj.get("returnCode").toString().equals("1")) { // 성공
 				result = response.getResponse();
-				log.info("///[getFilterList] result: {}", result);
+				//log.info("///[getFilterList] result: {}", result);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -217,17 +217,17 @@ public class SearchEngineDiquest {
 		paramMap.put("adminPort", port);
 		paramMap.put("pageNumber", String.valueOf(params.getPageNo()));
 		paramMap.put("rowsPerPage", String.valueOf(params.getPageSize()));
-		log.info("///[getGoodsList] paramMap: {}", paramMap);
+		//log.info("///[getGoodsList] paramMap: {}", paramMap);
 
 		try {
 			
 			JSONObject jsonObj = SearchService.getGoodsList(paramMap);
-			log.info("///[getGoodsList] jsonObj: {}", jsonObj.toJSONString());
+			//log.info("///[getGoodsList] jsonObj: {}", jsonObj.toJSONString());
 
 			if (jsonObj.get("returnCode").toString().equals("1")) { // 성공
 				Gson gson = new Gson();
 				result = gson.fromJson(jsonObj.toJSONString(), GoodsListResponse.class);
-				log.info("///[getGoodsList] result: {}", result);
+				//log.info("///[getGoodsList] result: {}", result);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -263,15 +263,15 @@ public class SearchEngineDiquest {
 		paramMap.put("keyword", keyword);
 		paramMap.put("pageNumber", String.valueOf(pageNo));
 		paramMap.put("rowsPerPage", String.valueOf(pageSize));
-		log.info("///[getPlanningList] paramMap: {}", paramMap);
+		//log.info("///[getPlanningList] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = PlanSearch.planSearchApi(paramMap);
-			log.info("///[getPlanningList] jsonObj: {}", jsonObj.toJSONString());
+			//log.info("///[getPlanningList] jsonObj: {}", jsonObj.toJSONString());
 
 			Gson gson = new Gson();
 			result = gson.fromJson(jsonObj.toJSONString(), PlanningResponse.class);
-			log.info("///[getPlanningList] result: {}", result);
+			//log.info("///[getPlanningList] result: {}", result);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -297,15 +297,15 @@ public class SearchEngineDiquest {
 		paramMap.put("keyword", keyword);
 		paramMap.put("pageNumber", String.valueOf(pageNo));
 		paramMap.put("rowsPerPage", String.valueOf(pageSize));
-		log.info("///[getEventList] paramMap: {}", paramMap);
+		//log.info("///[getEventList] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = EventSearch.eventSearchApi(paramMap);
-			log.info("///[getEventList] jsonObj: {}", jsonObj.toJSONString());
+			//log.info("///[getEventList] jsonObj: {}", jsonObj.toJSONString());
 
 			Gson gson = new Gson();
 			result = gson.fromJson(jsonObj.toJSONString(), PlanningResponse.class);
-			log.info("///[getEventList] result: {}", result);
+			//log.info("///[getEventList] result: {}", result);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -333,20 +333,20 @@ public class SearchEngineDiquest {
 	 */
 	public FeedbackResponse sendFeedbackLog(String keyword, String searchId){
 		FeedbackResponse result = new FeedbackResponse();
-		log.info("///[getFeedbackLog] keyword: {}", keyword);
-		log.info("///[getFeedbackLog] dq_id: {}", searchId);
+		//log.info("///[getFeedbackLog] keyword: {}", keyword);
+		//log.info("///[getFeedbackLog] dq_id: {}", searchId);
 		Map<String, Object> paramMap = new HashMap<String, Object>();
 		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		paramMap.put("dq_id", searchId);
-		log.info("///[getFeedbackLog] paramMap: {}", paramMap);
+		//log.info("///[getFeedbackLog] paramMap: {}", paramMap);
 
 		try {
 			int feedbackLog = SearchService.feedbackLog(paramMap);
-			log.info("///[getFeedbackLog] returnCode : {}", feedbackLog);
+			//log.info("///[getFeedbackLog] returnCode : {}", feedbackLog);
 			result.setReturnCode(feedbackLog);
-			log.info("///[getFeedbackLog] result: {}", result);
+			//log.info("///[getFeedbackLog] result: {}", result);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -133,13 +133,13 @@
 								<tbody>
 									<tr>
 										<td>입점 문의</td>
-										<td>석혜민</td>
-										<td>hmsuk@yes24.com</td>
+										<td>김초윤</td>
+										<td>cykim730@style24.com</td>
 									</tr>
 									<tr>
 										<td>제휴 문의</td>
-										<td>정석헌</td>
-										<td>blacktan01@yes24.com</td>
+										<td>김은진</td>
+										<td>kej@style24.com</td>
 									</tr>
 								</tbody>
 							</table>

src/main/webapp/WEB-INF/views/web/display/SearchSampleFormWeb.html

@@ -4966,13 +4966,13 @@
 								<tbody>
 								<tr>
 									<td>입점 문의</td>
-									<td>석혜민</td>
-									<td>hmsuk@yes24.com</td>
+									<td>김초윤</td>
+									<td>cykim730@style24.com</td>
 								</tr>
 								<tr>
 									<td>제휴 문의</td>
-									<td>정석헌</td>
-									<td>blacktan01@yes24.com</td>
+									<td>김은진</td>
+									<td>kej@style24.com</td>
 								</tr>
 								</tbody>
 							</table>