Merge branch 'JIWOO'

src/main/java/seed/com/gtm/board/CaseBoardController.java

@@ -39,7 +39,7 @@ public class CaseBoardController {
 	@RequestMapping(value="/board/{boardIdx}/write.do", method=RequestMethod.GET)
 	public String formWrite(ModelMap model, HttpSession session, @RequestParam Map<String,Object> paramMap, @PathVariable(value="boardIdx") String boardIdx){
 		paramMap.put("boardIdx", boardIdx);
-		return "/_extra/gtm/board/write";
+		return "/seed/_extra/gtm/board/write";
 	}
 	
 	@RequestMapping(value="/board/{boardIdx}/write.do", method=RequestMethod.POST)
@@ -56,7 +56,7 @@ public class CaseBoardController {
 		map.put("message", "common.message.reg");
 		map.put("url", "/gtm/case/board/"+boardIdx+"/list.do");
 		
-		return "/_common/jsp/message";
+		return "/seed/_common/jsp/message";
 	}
 	
 	
@@ -96,7 +96,7 @@ public class CaseBoardController {
 		model.addAttribute("selectNotice", selectNotice);
 		model.addAttribute("pageMaker", pageMaker);
 		
-		return "/_extra/gtm/board/list";
+		return "/seed/_extra/gtm/board/list";
 	}
 	
 	@RequestMapping("/board/{boardIdx}/view.do")
@@ -108,7 +108,7 @@ public class CaseBoardController {
 		model.addAttribute("boardIdx", boardIdx);
 		model.addAttribute("fileList", fileService.fileList(paramMap));
 		
-		return "/_extra/gtm/board/view";
+		return "/seed/_extra/gtm/board/view";
 	}
 	
 	@RequestMapping("/board/{boardIdx}/bbsDel.do")
@@ -123,7 +123,7 @@ public class CaseBoardController {
 				"&searchTilte=" + paramMap.get("searchTilte") + "&page=" + paramMap.get("page")
 				);
 		
-		return "/_common/jsp/message";
+		return "/seed/_common/jsp/message";
 	}
 	
 	@RequestMapping(value="/board/{boardIdx}/edit.do", method=RequestMethod.GET)
@@ -138,7 +138,7 @@ public class CaseBoardController {
 		model.addAttribute("fileList", fileList);
 		model.addAttribute("fileListSize", fileList.size());
 		
-		return "/_extra/gtm/board/edit";
+		return "/seed/_extra/gtm/board/edit";
 	}
 	
 	@RequestMapping(value="/board/{boardIdx}/edit.do", method=RequestMethod.POST)
@@ -158,6 +158,6 @@ public class CaseBoardController {
 				"&fileFuncType=" + paramMap.get("fileFuncType")
 				);
 		
-		return "/_common/jsp/message";
+		return "/seed/_common/jsp/message";
 	}
 }

src/main/java/seed/com/gtm/seedfile/SeedFileService.java

@@ -5,12 +5,14 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import egovframework.rte.fdl.property.EgovPropertyService;
 import egovframework.rte.psl.dataaccess.util.EgovMap;
 import seed.com.gtm.dao.SeedFileDao;
 import seed.com.gtm.service.BaseService;
@@ -26,6 +28,9 @@ public class SeedFileService {
 	@Autowired
 	private BaseService bservice;
 
+    @Resource(name = "propertiesService")
+    protected EgovPropertyService propertyService;
+    
 	public void fileInsert(Map<String, Object> paramMap, HttpServletRequest request, HttpSession session){
 
 		String siteIdx = SeedUtils.setReplaceNull(session.getAttribute("siteIdx"));
@@ -37,11 +42,14 @@ public class SeedFileService {
 		SeedProperties seedProperties = new SeedProperties();
 
 		String rootPath = null;
-		String tempPath = seedProperties.getConfigValue("file.temp.path");
+		//AS-iS 분쟁조정 설정
+		/*String tempPath = seedProperties.getConfigValue("file.temp.path");*/
+		String tempPath = propertyService.getString("Globals.fileStorePath");
 		if(fileFuncType.equals("trublchargermng")){
 			rootPath = seedProperties.getConfigValue("root.path");
 		}else{
-			rootPath = seedProperties.getConfigValue("file.real.path");
+			/*rootPath = seedProperties.getConfigValue("file.real.path");*/
+			rootPath = propertyService.getString("Globals.fileStorePath");
 		}
 
 		
@@ -51,7 +59,8 @@ public class SeedFileService {
 		String toDate = seedDateUtil.getSimpleDateFormat(new Date(), "yyyyMMdd");
 		String renameDate = seedDateUtil.getSimpleDateFormat(new Date(), "yyyyMMddHHmmss");
 
-		SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType);
+		/*SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType);*/
+		SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ fileFuncType);
 
 		int fileCnt = 0;
 

src/main/resources/egovframework/egovProps/globals_local.properties

@@ -47,4 +47,11 @@ Globals.prod.islocal=local
 
 #hibernate \uc124\uc815
 language=ko
-database.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+database.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
+
+#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \ud0c0\uc785 \uc124\uc815 ex). message,script
+Globals.message.check=message
+#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \ubc84\ud2bc\ud65c\uc131\ud654 \uc124\uc815 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568]
+Globals.message.confirm=false
+#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \uc2dc\uac04 \uc124\uc815 ex). 1500
+Globals.message.time=1500

src/main/webapp/WEB-INF/jsp/seed/_common/jsp/message.jsp

@@ -0,0 +1,166 @@
+<%@ page contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="s"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<!doctype html>
+<html lang="ko">
+	<head>
+	<title><s:message code="common.message.title" text="Message Title" /></title>
+	</head>
+	
+	<body style="visibility:visible">
+		<div id="wrapper">
+			<div class="login-page">
+				<div class="login-area">
+					<div class="login-wrap">
+						<div class="alert-area clear">
+							<h1></h1>
+							<p class="alert-content"><span id="message"></span></p>
+						</div>
+					</div>
+				</div>
+				<div class="footer">
+					Copyright (c) 2016 <strong>Global IT</strong>. All Rights Reserved.
+				</div>
+			</div>	
+		</div>
+
+		<script>
+		/* <![CDATA[ */
+		$(".wrapper").hide();
+		
+		try{
+			if(opener != "undefined" && opener && !opener.closed) {
+				if(opener.location.href.indexOf("Form") < 0 && opener.location.href.indexOf("Edit") < 0 && opener.location.href.indexOf("Reply") < 0){
+					opener.location.replace(opener.location.href);
+				}
+			}
+		}catch(e){
+
+		}finally{
+
+			var href = "";
+			
+			//팝업창에서 부모창에 값을 넣어줘야하는경우 https일때는 같이 https페이지로 이동
+// 			<c:if test='${fn:indexOf(url, "memberChk.do") <= -1}'>
+// 			if(location.href.indexOf("https") > -1){
+// 				href = location.href.replace("https://", "");
+// 				href = "http://"+href.substring(0, href.indexOf("/"));	
+// 			}	
+// 			</c:if>
+			
+			if("<s:eval expression="@property['Globals.message.check']" />" == "nomessage"){
+				
+				$("body").hide();
+				location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+				
+			}else{
+	
+				if("<s:eval expression="@property['Globals.message.check']" />" == "script"){
+	
+					<c:choose>
+						<c:when test='${fn:indexOf(message, "(nomessage)") > -1}'></c:when>
+						<c:when test='${fn:indexOf(message, "(message)") > -1}'>
+							alert("<c:out escapeXml='true' value='${fn:replace(message, "(message)", "")}' />");
+						</c:when>
+						<c:otherwise>
+							alert("<s:message code="${message}" text="Error Message" />");
+						</c:otherwise>
+					</c:choose>
+	
+					<c:out escapeXml='false' value='${append}' />
+	
+					if("<c:out escapeXml='true' value='${opener}' />" == "location"){
+						opener.location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+					}else if("<c:out escapeXml='true' value='${opener}' />" == "reload"){
+						opener.location.reload();
+						location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+					}else if("<c:out escapeXml='true' value='${opener}' />" == "parent"){
+						parent.location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+					}else if("<c:out escapeXml='false' value='${url}' />" != "" && "<c:out escapeXml='false' value='${url}' />" != "null" && "<c:out escapeXml='false' value='${url}' />" != null){
+						location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+					}
+	
+					if("<c:out escapeXml='true' value='${self}' />" == "close"){
+						self.close();
+					}else if("<c:out escapeXml='true' value='${self}' />" == "history"){
+						history.back();
+					}else if("<c:out escapeXml='true' value='${self}' />" == "history.go(-1)"){
+						history.go(-1);
+					}
+	
+				}else{
+	
+					$(".wrapper").show();
+	
+					<c:choose>
+						<c:when test='${fn:indexOf(message, "(nomessage)") > -1}'></c:when>				
+						<c:when test='${fn:indexOf(message, "(message)") > -1}'>
+							$("#message").append("<c:out escapeXml='true' value='${fn:replace(message, "(message)", "")}' />");
+						</c:when>
+						<c:otherwise>
+							$("#message").append("<s:message code="${message}" text="Error Message" />");
+						</c:otherwise>
+					</c:choose>
+					
+					<c:out escapeXml='false' value='${append}' />			
+					
+					if("<s:eval expression="@property['Globals.message.confirm']" />" == "false"){
+						var timer = setInterval(function (){
+	
+							if("<c:out escapeXml='true' value='${opener}' />" == "location"){
+								opener.location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+							}else if("<c:out escapeXml='true' value='${opener}' />" == "reload"){
+								opener.location.reload();
+								location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+							}else if("<c:out escapeXml='true' value='${opener}' />" == "parent"){
+								parent.location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+							}else if("<c:out escapeXml='false' value='${url}' />" != "" && "<c:out escapeXml='false' value='${url}' />" != "null" && "<c:out escapeXml='false' value='${url}' />" != null){
+								location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+							}
+	
+							if("<c:out escapeXml='true' value='${self}' />" == "close"){
+								self.close();
+							}else if("<c:out escapeXml='true' value='${self}' />" == "history"){
+								history.back();
+							}else if("<c:out escapeXml='true' value='${self}' />" == "history.go(-1)"){
+								history.go(-1);
+							}
+	
+							clearInterval(timer);
+						}, <s:eval expression="@property['Globals.message.time']" />);
+					}else{
+						$(".message_btn_area").append("<input type=\"image\" name=\"confirm\" id=\"confirm\" src=\"/img/common/message_ok.png\" alt=\"<s:message code="common.button.confirm"  text="Error Button" />\"");
+						$("#confirm").click(function(){
+	
+							if("<c:out escapeXml='true' value='${opener}' />" == "location"){
+								opener.location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+							}else if("<c:out escapeXml='true' value='${opener}' />" == "reload"){
+								opener.location.reload();
+								location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+							}else if("<c:out escapeXml='true' value='${opener}' />" == "parent"){
+								parent.location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+							}else if("<c:out escapeXml='false' value='${url}' />" != "" && "<c:out escapeXml='false' value='${url}' />" != "null" && "<c:out escapeXml='false' value='${url}' />" != null){
+								location.replace(href+"<c:out escapeXml='false' value='${url}' />");
+							}
+	
+							if("<c:out escapeXml='true' value='${self}' />" == "close"){
+								self.close();
+							}else if("<c:out escapeXml='true' value='${self}' />" == "history"){
+								history.back();
+							}else if("<c:out escapeXml='true' value='${self}' />" == "history.go(-1)"){
+								history.go(-1);
+							}
+	
+						});
+					}
+				}
+			}
+		}
+		/* ]]> */
+		</script>
+		
+	</body>
+	
+</html>