diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java index d9312f60..6caa6ea7 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java @@ -139,9 +139,13 @@ public class CommonWebController { @RequestMapping("/popup/fileUploadPop.do") public String fileUploadPop(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO, ModelMap model, HttpServletRequest request) throws Exception{ + try { + + //로그인 정보 가져오기 LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); vEEduAplctVO.setUserId(loginVO.getUniqId()); + System.out.println("===================== loginVO.getUniqId() :: " + loginVO.getUniqId()); String fileType = request.getParameter("fileType"); System.out.println("=====================" + fileType); @@ -169,7 +173,10 @@ public class CommonWebController { List result = fileService.selectFileInfs(fileVO); model.addAttribute("fileList", result); model.addAttribute("fileListCnt", result.size()); - + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } return "/web/ve/comm/fileUploadPop"; } diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 0d3f236d..f04057fd 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -158,4 +158,9 @@ Globals.pdf.webpath=/pdf/out/ #\uac1c\ubc1c\uc11c\ubc84 Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 -#Globals.prod.islocal=real \ No newline at end of file +#Globals.prod.islocal=real + + +#\ub300\uc6a9\ub7c9 innorix license +Globals.Innorix.License=dev +Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/ \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 5e0e155c..178c45c5 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -151,4 +151,9 @@ Globals.pdf.webpath=/pdf/out/ #\uac1c\ubc1c\uc11c\ubc84 Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 -#Globals.prod.islocal=real \ No newline at end of file +#Globals.prod.islocal=real + + +#\ub300\uc6a9\ub7c9 innorix license +Globals.Innorix.License=dev +Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/ \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index 13be53e8..977b4723 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -157,4 +157,9 @@ Globals.pdf.webpath=/pdf/out/ #\uac1c\ubc1c\uc11c\ubc84 #Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 -Globals.prod.islocal=real \ No newline at end of file +Globals.prod.islocal=real + + +#\ub300\uc6a9\ub7c9 innorix license +Globals.Innorix.License=svr +Globals.Innorix.FilePath=/usr/local/tomcat/file/sht/ \ No newline at end of file diff --git a/src/main/resources/egovframework/spring/com/context-datasource.xml b/src/main/resources/egovframework/spring/com/context-datasource.xml index 0bd360f4..3f66279c 100644 --- a/src/main/resources/egovframework/spring/com/context-datasource.xml +++ b/src/main/resources/egovframework/spring/com/context-datasource.xml @@ -1,16 +1,19 @@ + xmlns:util="http://www.springframework.org/schema/util" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util-4.0.xsd"> - classpath:/egovframework/egovProps/globals_#{systemProperties['spring.profiles.active']}.properties + diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp index 7cab601f..5c2022be 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp @@ -2,6 +2,7 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> @@ -64,6 +65,14 @@ + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + +
+ " />