diff --git a/.classpath b/.classpath
index 16fa6cf..36a4059 100644
--- a/.classpath
+++ b/.classpath
@@ -29,10 +29,99 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin_list.txt b/admin_list.txt
index a89e5f6..b820422 100644
--- a/admin_list.txt
+++ b/admin_list.txt
@@ -1,26 +1,11 @@
-src\main\webapp\css\admins\style.css
-src\main\webapp\css\admins\style.css.map
-src\main\webapp\images\admins\frame\top_menu.gif
-src\main\webapp\WEB-INF\views\admins\frame\top.jsp
-src\main\webapp\WEB-INF\views\admins\main\index.jsp
-src\main\webapp\WEB-INF\views\admins\main\main.jsp
-src\main\webapp\WEB-INF\views\admins\constructionProjectManagement\00.jsp
-src\main\webapp\WEB-INF\views\admins\constructionProjectManagement\left.jsp
-src\main\webapp\WEB-INF\views\admins\constructionProjectManagement\construction-project-statistics-index.jsp
-src\main\webapp\images\admins\constructionProjectManagement\1_tit_01.gif
-src\main\java\geoinfo\admins\constructionProjectManagement\ConstructionProjectManagementController.java
-src\main\webapp\js\admins\chart.js
-#일반사용자관리 첫 화면 사용자 목록 안 보이도록 하기
-src\main\webapp\WEB-INF\views\admins\frame\top.jsp
-src\main\webapp\WEB-INF\views\admins\main\index.jsp
-src\main\webapp\WEB-INF\views\admins\main\main.jsp
+#게시판 - 자료실에 파일 업로드 안 되는 문제 수정 건
+#src\main\resources\egovframework\egovProps\globals.properties
+src\main\java\geoinfo\admins\board\CommunityController.java
+src\main\java\geoinfo\admins\board\GroundReportController.java
+src\main\java\geoinfo\admins\board\RefrncRoomController.java
+src\main\java\geoinfo\admins\chLog\service\impl\DownloadAppServiceImpl.java
+src\main\java\geoinfo\admins\chLog\ChInfoController.java
+src\main\java\geoinfo\admins\chLog\DownloadAppController.java
+src\main\java\geoinfo\admins\notice\NoticeMngController.java
src\main\java\geoinfo\admins\user\GeneralUserMngController.java
-src\main\webapp\WEB-INF\views\admins\user\00.jsp
-src\main\webapp\js\admins\adlogin.js
-src\main\webapp\WEB-INF\views\admins\main\index.jsp
-src\main\webapp\WEB-INF\views\admins\frame\mainframe.jsp
-src\main\resources\geoinfo\sqlmap\mappers\admins\main\Login_SQL.xml
-src\main\java\geoinfo\admins\main\service\MainMapper.java
-src\main\java\geoinfo\admins\main\service\impl\MainServiceImpl.java
-src\main\java\geoinfo\admins\main\service\MainService.java
-src\main\java\geoinfo\admins\main\MainController.java
\ No newline at end of file
+src\main\java\geoinfo\com\file\FileController.java
diff --git a/src/main/java/geoinfo/admins/board/CommunityController.java b/src/main/java/geoinfo/admins/board/CommunityController.java
index 7f6760c..2acbcda 100644
--- a/src/main/java/geoinfo/admins/board/CommunityController.java
+++ b/src/main/java/geoinfo/admins/board/CommunityController.java
@@ -33,7 +33,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
public class CommunityController {
@Resource(name = "communityService")
private CommunityService masterService;
- private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
+
@RequestMapping(value = "admins/board/12.do")
public String board00( @RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception {
diff --git a/src/main/java/geoinfo/admins/board/GroundReportController.java b/src/main/java/geoinfo/admins/board/GroundReportController.java
index dd26ccf..db36ded 100644
--- a/src/main/java/geoinfo/admins/board/GroundReportController.java
+++ b/src/main/java/geoinfo/admins/board/GroundReportController.java
@@ -41,7 +41,7 @@ public class GroundReportController {
private static final Logger LOGGER = Logger.getLogger(RefrncRoomController.class.getName());
// 운영서버 실제 경로
- private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
//private final String savePath = "C:\\app\\files\\ground_report";
@RequestMapping(value = "admins/greport/13.do")
diff --git a/src/main/java/geoinfo/admins/board/RefrncRoomController.java b/src/main/java/geoinfo/admins/board/RefrncRoomController.java
index 89c3c65..95735cf 100644
--- a/src/main/java/geoinfo/admins/board/RefrncRoomController.java
+++ b/src/main/java/geoinfo/admins/board/RefrncRoomController.java
@@ -41,7 +41,7 @@ public class RefrncRoomController {
@Resource(name = "refrncRoomService")
private RefrncRoomService masterService;
- private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
@RequestMapping(value = "admins/board/01.do")
public String board01( @RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception {
@@ -123,8 +123,34 @@ public class RefrncRoomController {
params.put("saveName1", saveName1);
params.put("fileName1", fileName1.getOriginalFilename());
+ File directory = new File(savePath);
+
+ if (directory.exists() && directory.isDirectory()) {
+ } else {
+ System.out.println("\n--------------------------------------------------------------\n" +
+ request.getRequestURI() + " OUT: 디렉토리가 존재하지 않습니다." +
+ "\n--------------------------------------------------------------\n" +
+ "EgovProperties.getProperty(\"Geoinfo.FilePath.User\"):[" + savePath + "]\n" +
+ "\n--------------------------------------------------------------\n");
+ jsonMap.put("FilePath", savePath);
+ if (directory.mkdirs()) {
+ System.out.println("디렉토리가 성공적으로 생성되었습니다.");
+ } else {
+ // 디렉토리 생성 실패
+ if (savePath.startsWith("D:\\")) {
+ File eDrive = new File("D:\\");
+ if (!eDrive.exists()) {
+ throw new IOException("D: 드라이브가 존재하지 않습니다.");
+ } else {
+ throw new IOException("디렉토리 생성에 실패했습니다.");
+ }
+ }
+ throw new IOException("디렉토리 생성에 실패했습니다.");
+ }
+ }
+
File saveFile = new File(savePath, FilenameUtils.getName(saveName1));
- fileName1.transferTo(saveFile);
+ fileName1.transferTo(saveFile);
}
if(fileName2.getOriginalFilename().equals("")) {
diff --git a/src/main/java/geoinfo/admins/chLog/ChInfoController.java b/src/main/java/geoinfo/admins/chLog/ChInfoController.java
index 68ea22f..5befc3b 100644
--- a/src/main/java/geoinfo/admins/chLog/ChInfoController.java
+++ b/src/main/java/geoinfo/admins/chLog/ChInfoController.java
@@ -24,15 +24,11 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.FilenameUtils;
import org.apache.log4j.Logger;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Sheet;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.util.FileCopyUtils;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@@ -43,7 +39,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import egovframework.com.cmm.service.EgovProperties;
import egovframework.rte.psl.dataaccess.util.EgovMap;
import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
-import geoinfo.admins.board.RefrncRoomController;
import geoinfo.admins.chLog.service.ChInfoService;
import geoinfo.com.EgovExcel;
import geoinfo.com.GeoinfoCommon;
@@ -72,12 +67,12 @@ public class ChInfoController {
@Resource(name = "chInfoService")
private ChInfoService masterService;
- private static final Logger LOGGER = Logger.getLogger(RefrncRoomController.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(ChInfoController.class.getName());
// 운영서버 경로
// private final String savePath = "D:\\Tomcat6\\geoinfoEgov\\webapps\\geoinfo\\files";
// 개발서버 경로
- private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
/**
* 관리자시스템 > 유통/공급 통계분석 > 유통정보 > 날짜별 리스트
@@ -865,113 +860,4 @@ public class ChInfoController {
return transposedList;
}
- @RequestMapping(value = "admins/downloadExcel.do", method = RequestMethod.POST)
- public void downloadExcel(@RequestParam HashMap params, HSSFWorkbook workbook, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
- String pId = (String) params.get("pId");
- String resultListJson = (String) params.get("resultList");
-
- ObjectMapper mapper = new ObjectMapper();
- List> result = mapper.readValue(resultListJson, new TypeReference>>(){});
-
- String fileName = "";
- String sheetName = "";
-
- switch (pId) {
- case "11":
- fileName = "공종별등록정보_";
- sheetName = "공종별등록정보";
- break;
- case "12":
- fileName = "공정별등록정보_";
- sheetName = "공정별등록정보";
- break;
- case "13":
- fileName = "시도별등록정보_";
- sheetName = "시도별등록정보";
- break;
- case "14":
- String sidoCode = (String) params.get("sidoCode");
- switch (sidoCode) {
- case "04:":
- fileName = "시군구별_서울특별시_";
- sheetName = "시군구별_서울특별시";
- break;
- case "05:":
- fileName = "시군구별_부산광역시_";
- sheetName = "시군구별_부산광역시";
- break;
- case "06:":
- fileName = "시군구별_광주광역시_";
- sheetName = "시군구별_광주광역시";
- break;
- case "07:":
- fileName = "시군구별_대전광역시_";
- sheetName = "시군구별_대전광역시";
- break;
- case "08:":
- fileName = "시군구별_대구광역시_";
- sheetName = "시군구별_대구광역시";
- break;
- case "09:":
- fileName = "시군구별_인천광역시_";
- sheetName = "시군구별_인천광역시";
- break;
- case "10:":
- fileName = "시군구별_울산광역시_";
- sheetName = "시군구별_울산광역시";
- break;
- case "11:":
- fileName = "시군구별_경기도_";
- sheetName = "시군구별_경기도";
- break;
- case "12:":
- fileName = "시군구별_강원도_";
- sheetName = "시군구별_강원도";
- break;
- case "13:":
- fileName = "시군구별_충청북도_";
- sheetName = "시군구별_충청북도";
- break;
- case "14:":
- fileName = "시군구별_충청남도_";
- sheetName = "시군구별_충청남도";
- break;
- case "15:":
- fileName = "시군구별_경상북도_";
- sheetName = "시군구별_경상북도";
- break;
- case "16:":
- fileName = "시군구별_경상남도_";
- sheetName = "시군구별_경상남도";
- break;
- case "17:":
- fileName = "시군구별_전라북도_";
- sheetName = "시군구별_전라북도";
- break;
- case "18:":
- fileName = "시군구별_전라남도_";
- sheetName = "시군구별_전라남도";
- break;
- case "19:":
- fileName = "시군구별_제주특별자치도_";
- sheetName = "시군구별_제주특별자치도";
- break;
- case "20:":
- fileName = "시군구별_세종특별자치시_";
- sheetName = "시군구별_세종특별자치시";
- break;
- }
- break;
- }
-
- HashMap map = new HashMap();
-
- map.put("selectInfoListExcel", result);
- map.put("fileName", fileName);
- map.put("sheetName", sheetName);
-
- buildExcelDocument(map, workbook, request, response);
- }
-
}
diff --git a/src/main/java/geoinfo/admins/chLog/DownloadAppController.java b/src/main/java/geoinfo/admins/chLog/DownloadAppController.java
index cf8e978..8aba32b 100644
--- a/src/main/java/geoinfo/admins/chLog/DownloadAppController.java
+++ b/src/main/java/geoinfo/admins/chLog/DownloadAppController.java
@@ -283,7 +283,7 @@ public class DownloadAppController {
// 한글 파일이름 깨질 경우
// String docName = new String(GeoinfoCommon.parseData(fileName).getBytes("8859_1"), "utf-8");
//String filePath = "D:\\Tomcat6\\geoinfoEgov\\webapps\\geoinfo\\files";
- String filePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ String filePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
OutputStream os = response.getOutputStream();
FileInputStream fis = null;
diff --git a/src/main/java/geoinfo/admins/chLog/service/impl/DownloadAppServiceImpl.java b/src/main/java/geoinfo/admins/chLog/service/impl/DownloadAppServiceImpl.java
index 7977e89..1bad43a 100644
--- a/src/main/java/geoinfo/admins/chLog/service/impl/DownloadAppServiceImpl.java
+++ b/src/main/java/geoinfo/admins/chLog/service/impl/DownloadAppServiceImpl.java
@@ -208,7 +208,7 @@ public class DownloadAppServiceImpl implements DownloadAppService {
HashMap params, MultipartHttpServletRequest multiRequest) throws Exception{
//String savePath = "D:\\Tomcat6\\geoinfoEgov\\webapps\\geoinfo\\files"
- String savePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ String savePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
Calendar calendar = Calendar.getInstance();
java.util.Date date = calendar.getTime();
String today = (new SimpleDateFormat("yyyyMMddHHmmss").format(date));
diff --git a/src/main/java/geoinfo/admins/notice/NoticeMngController.java b/src/main/java/geoinfo/admins/notice/NoticeMngController.java
index 9643e49..73dbf67 100644
--- a/src/main/java/geoinfo/admins/notice/NoticeMngController.java
+++ b/src/main/java/geoinfo/admins/notice/NoticeMngController.java
@@ -49,7 +49,7 @@ public class NoticeMngController {
@Resource(name = "noticeMngService")
private NoticeMngService masterService;
- private final String noticeFilePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ private final String noticeFilePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
@RequestMapping(value = "admins/notice/00.do")
public String selectInfoList(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception {
diff --git a/src/main/java/geoinfo/admins/user/GeneralUserMngController.java b/src/main/java/geoinfo/admins/user/GeneralUserMngController.java
index 967f597..d122fb9 100644
--- a/src/main/java/geoinfo/admins/user/GeneralUserMngController.java
+++ b/src/main/java/geoinfo/admins/user/GeneralUserMngController.java
@@ -78,7 +78,7 @@ public class GeneralUserMngController {
// 운영서버 경로
// private final String savePath = "D:\\Tomcat6\\geoinfoEgov\\webapps\\geoinfo\\files";
// 개발서버 경로
- private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ private final String savePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
@RequestMapping(value = "admins/user/00.do")
public String selectInfoList(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception {
diff --git a/src/main/java/geoinfo/com/file/FileController.java b/src/main/java/geoinfo/com/file/FileController.java
index 4261cf2..3d8b248 100644
--- a/src/main/java/geoinfo/com/file/FileController.java
+++ b/src/main/java/geoinfo/com/file/FileController.java
@@ -31,7 +31,7 @@ public class FileController
@Resource(name = "fileService")
private FileService fileService;
- public String filePath = EgovProperties.getProperty("Geoinfo.FilePath");
+ public String filePath = EgovProperties.getProperty("Geoinfo.FilePath.User");
// 파일 다운로드
@RequestMapping(value = "file.do")
diff --git a/src/main/java/geoinfo/util/RsWrapper.java b/src/main/java/geoinfo/util/RsWrapper.java
index ba5fc61..c6ae8ed 100644
--- a/src/main/java/geoinfo/util/RsWrapper.java
+++ b/src/main/java/geoinfo/util/RsWrapper.java
@@ -20,7 +20,6 @@ import javax.servlet.http.HttpServletRequest;
import org.jfree.util.Log;
import org.slf4j.LoggerFactory;
-import com.extentech.toolkit.Logger;
public class RsWrapper implements java.io.Serializable {
diff --git a/src/main/resources/config/context-common.xml b/src/main/resources/config/context-common.xml
index e0c6447..5926547 100644
--- a/src/main/resources/config/context-common.xml
+++ b/src/main/resources/config/context-common.xml
@@ -72,12 +72,12 @@
-
+
diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties
index 217e0b7..fac45cb 100644
--- a/src/main/resources/egovframework/egovProps/globals.properties
+++ b/src/main/resources/egovframework/egovProps/globals.properties
@@ -13,7 +13,7 @@ Oracle.Driver=oracle.jdbc.driver.OracleDriver
#Oracle.Url=jdbc:oracle:thin:@192.168.0.29:1521:xe
#Oracle.Url=jdbc:oracle:thin:@192.168.0.8:3452:orcl
-Oracle.Url=jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV
+Oracle.Url=jdbc:oracle:thin:@10.dbnt.co.kr:1521:ORAGEODEV
# \uc2e4\uc11c\ubc84 -> 218.232.234.200:1521:orageodev
#Oracle.Url=jdbc:oracle:thin:@218.232.234.200:1521:orageodev
#Oracle.Url=jdbc:oracle:thin:@localhost:1521:xe
@@ -28,5 +28,8 @@ Oracle.Password=geoinfo
################### \ud30c\uc77c\uad00\ub828 ###################
###############################################
-Geoinfo.FilePath=D:\\app_geoinfo\\app\\eclipse\\workspace\\geoinfo_admin\\src\\main\\webapp\\files\\
-#Geoinfo.FilePath=D:\\gitaey\\geoinfo_eGov\\workspace\\geoinfo_eGov\\src\\main\\webapp\\files\\
\ No newline at end of file
+#Geoinfo.FilePath=D:\\app_geoinfo\\app\\eclipse\\workspace\\geoinfo_admin\\src\\main\\webapp\\files\\
+#Geoinfo.FilePath=D:\\gitaey\\geoinfo_eGov\\workspace\\geoinfo_eGov\\src\\main\\webapp\\files\\
+Geoinfo.FilePath=C:\\geoinfo_admin_files\\
+Geoinfo.FilePath.Admin=C:\\geoinfo_files_admin\\
+Geoinfo.FilePath.User=C:\\geoinfo_files_user\\
\ No newline at end of file
diff --git a/src/main/resources/egovframework/spring/context-common.xml b/src/main/resources/egovframework/spring/context-common.xml
index 68fdfcb..d5f583c 100644
--- a/src/main/resources/egovframework/spring/context-common.xml
+++ b/src/main/resources/egovframework/spring/context-common.xml
@@ -74,12 +74,12 @@
-
+
-
+
diff --git a/src/main/webapp/WEB-INF/lib/ICERTSecu_JDK17.jar b/src/main/webapp/WEB-INF/lib/ICERTSecu_JDK17.jar
new file mode 100644
index 0000000..c74e614
Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/ICERTSecu_JDK17.jar differ