diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index f25d8ba8..af5d4aa7 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -1462,6 +1462,12 @@ public class MainController { ) { menuUrl = "/web/user/mediation/case/01/154/mediationApp.do"; } + /*자주하는 질문 > (기타)절차종결 관련 질문*/ + else if( + menuUrl.contains("/web/user/bbs/case/3/300/") + ) { + menuUrl = "/web/user/bbs/case/3/300/bbsDataList.do"; + } // 상세화면 URL로 메뉴화면 매핑이 안되어, 문자열 치환으로 매핑... diff --git a/src/main/java/seed/common/web/InnorixFileController.java b/src/main/java/seed/common/web/InnorixFileController.java index fa94052d..b083e3cb 100644 --- a/src/main/java/seed/common/web/InnorixFileController.java +++ b/src/main/java/seed/common/web/InnorixFileController.java @@ -52,16 +52,20 @@ public class InnorixFileController { String fileFuncType = (String)paramMap.get("fileFuncType"); String rootPath = null; + String directory = null; if(fileFuncType.equals("trublchargermng")){ rootPath = globalRootPath; + SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+"/upload/uploadFiles/"+fileFuncType); + directory = rootPath + "/"+siteIdx+"/upload/uploadFiles/"+"/"+fileFuncType+"/"; }else{ rootPath = globalRealPath; + SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+"/"+ fileFuncType); + directory = rootPath + "/"+siteIdx+"/"+fileFuncType+"/"; } - SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+"/"+ fileFuncType); modelAndView.setViewName("jsonView"); - modelAndView.addObject("directory", rootPath + "/"+siteIdx+"/"+fileFuncType+"/"); + modelAndView.addObject("directory", directory); modelAndView.addObject("result", "success"); }catch(Exception e) { modelAndView.addObject("result", "fail"); diff --git a/src/main/java/seed/user/bbs/web/WebUserBbsController.java b/src/main/java/seed/user/bbs/web/WebUserBbsController.java index 5c86eb99..f98eb071 100644 --- a/src/main/java/seed/user/bbs/web/WebUserBbsController.java +++ b/src/main/java/seed/user/bbs/web/WebUserBbsController.java @@ -914,6 +914,7 @@ public class WebUserBbsController { map.put("tBbsDataDB", tBbsDataDB); map.put("toDate", sdf.format(new Date())); + map.put("bbsSetIdx", bbsSetIdx); map.put("page", paging.getPage()); map.put("pagec", paging.getPagec()); diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index dffde063..a616d278 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -202,7 +202,9 @@ http.url= #\ud574\ub2f9 \uc0ac\uc774\ud2b8 URL root.url=http://localhost #\ud574\ub2f9 \uc11c\ubc84 SEED\uc11c\ubc84 \uacbd\ub85c -root.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site +#root.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site +#\ud14c\uc2a4\ud2b8\uc6a9 +root.path=/usr/local/homepage/WEB-INF/views/site #\ud574\ub2f9 \uc0ac\uc774\ud2b8 URL path root.contextpath= @@ -210,7 +212,9 @@ root.contextpath= file.temp.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site/case/upload/tempFiles #file.temp.path=C:/Project_Files/case_seed-v3.0/WebContent/WEB-INF/views/site/case/upload/tempFiles #\ucca8\ubd80\ud30c\uc77c \uc5c5\ub85c\ub4dc\ud3f4\ub354 -file.real.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site/case/upload/uploadFiles +#file.real.path=D:/project/git/case_seed/WebContent/WEB-INF/views/site/case/upload/uploadFiles +#\ud14c\uc2a4\ud2b8\uc6a9 +file.real.path=/usr/local/homepage/WEB-INF/views/site/case/upload/uploadFiles #file.real.path=C:/Project_Files/case_seed-v3.0/WebContent/WEB-INF/views/site/case/upload/uploadFiles #NICE diff --git a/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp b/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp index 7f5a029d..b1a9a37a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/bbsDataList.jsp @@ -350,8 +350,8 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/faqDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/faqDetail.jsp index 05efc71f..30752182 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/faqDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/bbs/bbs/faqDetail.jsp @@ -8,7 +8,7 @@