From f1f3100c0ba419f8be556a3d1e53366bd3e0785f Mon Sep 17 00:00:00 2001 From: ijunho Date: Mon, 15 Sep 2025 14:56:49 +0900 Subject: [PATCH] Merge branch 'master_tolag3' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 게시판 관리 수정 --- .../cmm/web/EgovFileDownloadController.java | 4 +-- .../cmm/web/EgovImageProcessController.java | 4 +-- .../web/EgovBBSAttributeManageController.java | 3 -- .../cop/bbs/web/EgovBBSManageController.java | 26 ++--------------- .../endInfo/web/VEAdultEduEndController.java | 4 +-- .../endInfo/web/VEEduEndController.java | 4 +-- .../web/OprtnAplctMngController.java | 4 +-- .../web/EduRsltMngTngrController.java | 4 +-- src/main/java/kcc/web/MainController.java | 28 +++++++++---------- .../EgovProgrmManage_SQL_Postgresql.xml | 2 +- .../cop/bbs/EgovBBSMaster_SQL_Postgresql.xml | 6 ++-- .../WEB-INF/jsp/cop/bbs/EgovBoardIdSearch.jsp | 4 +-- .../WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp | 8 +++--- .../jsp/uss/ion/pwm/PopupzoneList_back.jsp | 2 +- .../jsp/web/cop/bbs/EgovNoticeList_back.jsp | 4 +-- .../jsp/web/cop/bbs/EgovNoticePhotoList.jsp | 4 +-- .../web/cop/bbs/EgovNoticePhotoList2024.jsp | 4 +-- .../cop/bbs/EgovNoticePhotoList2024Ajax.jsp | 4 +-- .../web/cop/bbs/EgovNoticePhotoListAjax.jsp | 4 +-- src/main/webapp/css/post.css | 4 +-- src/main/webapp/css/web/post.css | 4 +-- src/main/webapp/css/web/post2.css | 4 +-- 22 files changed, 55 insertions(+), 80 deletions(-) diff --git a/src/main/java/kcc/com/cmm/web/EgovFileDownloadController.java b/src/main/java/kcc/com/cmm/web/EgovFileDownloadController.java index 7efe3fe5..42ec955a 100644 --- a/src/main/java/kcc/com/cmm/web/EgovFileDownloadController.java +++ b/src/main/java/kcc/com/cmm/web/EgovFileDownloadController.java @@ -100,9 +100,9 @@ public class EgovFileDownloadController { } else if (browser.equals("Trident")) { // IE11 문자열 깨짐 방지 encodedFilename = URLEncoder.encode(filename, "UTF-8").replaceAll("\\+", "%20"); } else if (browser.equals("Firefox")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Opera")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Chrome")) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < filename.length(); i++) { diff --git a/src/main/java/kcc/com/cmm/web/EgovImageProcessController.java b/src/main/java/kcc/com/cmm/web/EgovImageProcessController.java index 4ac8a7f3..d09b745f 100644 --- a/src/main/java/kcc/com/cmm/web/EgovImageProcessController.java +++ b/src/main/java/kcc/com/cmm/web/EgovImageProcessController.java @@ -37,9 +37,8 @@ import kcc.com.cmm.service.FileVO; * @see * */ -@SuppressWarnings("serial") @Controller -public class EgovImageProcessController extends HttpServlet { +public class EgovImageProcessController{ @Resource(name = "EgovFileMngService") private EgovFileMngService fileService; @@ -56,7 +55,6 @@ public class EgovImageProcessController extends HttpServlet { * @param response * @throws Exception */ - @SuppressWarnings("resource") @RequestMapping("/cmm/fms/getImage.do") public void getImageInf(SessionVO sessionVO, ModelMap model, @RequestParam Map commandMap, HttpServletResponse response) throws Exception { diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java index 3cccd566..3cf0f74e 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java @@ -640,9 +640,6 @@ public class EgovBBSAttributeManageController { searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); -System.out.println("==========="); - - /*OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY*/ Map map = bbsAttrbService.selectBBSIdList(searchVO); int totCnt = Integer.parseInt((String) map.get("resultCnt")); diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index 37831a86..9edeb54c 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -224,10 +224,6 @@ public class EgovBBSManageController { public String selectBoardArticles(@ModelAttribute("searchVO") BoardVO boardVO, ModelMap model , HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) throws Exception { - System.out.println("---start----"); - System.out.println("---start----"); - System.out.println("---start----"); - LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); BoardMasterVO vo = new BoardMasterVO(); vo.setBbsId(boardVO.getBbsId()); @@ -255,13 +251,8 @@ public class EgovBBSManageController { boardVO.setLoginId(user.getId()); if("".equals(master.getSearchSortCnd())){ //최초조회시 최신것 조회List - if("BBSMSTR_000000000528".equals(master.getBbsId())) { //묻고답하기 제외 - - }else { - boardVO.setSearchSortCnd("FRST_REGIST_PNTTM"); - boardVO.setSearchSortOrd("desc"); - } - + boardVO.setSearchSortCnd("FRST_REGIST_PNTTM"); + boardVO.setSearchSortOrd("desc"); } // 공지사항 @@ -271,7 +262,7 @@ public class EgovBBSManageController { boardVO.setNoticeAt("N"); //다음에 공지사항 아닌것만 검색 } - if (("BBST05").equals(master.getBbsTyCode())) { //재단소식이면 + if (("BBST05").equals(master.getBbsTyCode())) { boardVO.setSearchSortCnd("FRST_REGIST_PNTTM"); boardVO.setSearchSortOrd("desc"); } @@ -289,21 +280,10 @@ public class EgovBBSManageController { model.addAttribute("paginationInfo", paginationInfo); model.addAttribute("Authority", user.getAuthority()); //ROLE_ADR_JRSDC - //System.out.println("user.getAuthority()"); - //System.out.println(user.getAuthority()); - //System.out.println(user.get.getAuthority()); - //임시 데이터 이관용 String ip = request.getHeader("X-Forwarded-For"); if (ip == null) ip = request.getRemoteAddr(); - String ddd = ""; - if("219.240.88.15".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { - model.addAttribute("Transfer", true ); - } - System.out.println("---ip----"+ip); - - return "cop/bbs/EgovNoticeList"; } diff --git a/src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java b/src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java index 553bcfe9..a927635f 100644 --- a/src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java +++ b/src/main/java/kcc/ve/instr/adultVisitEdu/endInfo/web/VEAdultEduEndController.java @@ -855,9 +855,9 @@ public class VEAdultEduEndController { } else if (browser.equals("Trident")) { // IE11 문자열 깨짐 방지 encodedFilename = URLEncoder.encode(filename, "UTF-8").replaceAll("\\+", "%20"); } else if (browser.equals("Firefox")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Opera")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Chrome")) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < filename.length(); i++) { diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java index 01defb8b..4bef9365 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/endInfo/web/VEEduEndController.java @@ -928,9 +928,9 @@ public class VEEduEndController { } else if (browser.equals("Trident")) { // IE11 문자열 깨짐 방지 encodedFilename = URLEncoder.encode(filename, "UTF-8").replaceAll("\\+", "%20"); } else if (browser.equals("Firefox")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Opera")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Chrome")) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < filename.length(); i++) { diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java index 2a4fbf95..f69c8a88 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java @@ -1278,9 +1278,9 @@ String[] order = { } else if (browser.equals("Trident")) { // IE11 문자열 깨짐 방지 encodedFilename = URLEncoder.encode(filename, "UTF-8").replaceAll("\\+", "%20"); } else if (browser.equals("Firefox")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Opera")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Chrome")) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < filename.length(); i++) { diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index ac5e2fe3..46447335 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -2047,9 +2047,9 @@ public class EduRsltMngTngrController { } else if (browser.equals("Trident")) { // IE11 문자열 깨짐 방지 encodedFilename = URLEncoder.encode(filename, "UTF-8").replaceAll("\\+", "%20"); } else if (browser.equals("Firefox")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Opera")) { - encodedFilename = "\"" + new String(filename.getBytes("UTF-8"), "8859_1") + "\""; + encodedFilename = URLEncoder.encode(filename, "UTF-8").replace("+", "%20"); } else if (browser.equals("Chrome")) { StringBuffer sb = new StringBuffer(); for (int i = 0; i < filename.length(); i++) { diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 340509e2..6ad61672 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -537,20 +537,20 @@ public class MainController { List fullMenuResultList = menuCreateManageService.selectMenuListJtreeWeb(fullMenuVo) ; // 메인 메뉴 청소년, 성인 글 색상 적용 - for(MenuManageJTreeVO empMenuManageJTreeVO : menuResultList) { - /*찾아가는 저작권교육 청소년*/ - if("99928000".equals(empMenuManageJTreeVO.getMenuNo())){ - if(empMenuManageJTreeVO.getMenuNm().contains("청소년")) { - empMenuManageJTreeVO.setMenuNm(empMenuManageJTreeVO.getMenuNm().replace("청소년", "청소년")); - } - } - /*찾아가는 저작권교육 성인*/ - if("99929000".equals(empMenuManageJTreeVO.getMenuNo())){ - if(empMenuManageJTreeVO.getMenuNm().contains("성인")) { - empMenuManageJTreeVO.setMenuNm(empMenuManageJTreeVO.getMenuNm().replace("성인", "성인")); - } - } - } +// for(MenuManageJTreeVO empMenuManageJTreeVO : menuResultList) { +// /*찾아가는 저작권교육 청소년*/ +// if("99928000".equals(empMenuManageJTreeVO.getMenuNo())){ +// if(empMenuManageJTreeVO.getMenuNm().contains("청소년")) { +// empMenuManageJTreeVO.setMenuNm(empMenuManageJTreeVO.getMenuNm().replace("청소년", "청소년")); +// } +// } +// /*찾아가는 저작권교육 성인*/ +// if("99929000".equals(empMenuManageJTreeVO.getMenuNo())){ +// if(empMenuManageJTreeVO.getMenuNm().contains("성인")) { +// empMenuManageJTreeVO.setMenuNm(empMenuManageJTreeVO.getMenuNm().replace("성인", "성인")); +// } +// } +// } List menuTwoExist = new ArrayList<>(); //2뎁스의 하위 매뉴가 있는것 조회 HashSet underMenuEmpty = new HashSet(); //2뎁스의 하위매뉴 없는것 조회 diff --git a/src/main/resources/egovframework/sqlmap/config/postgresql/EgovProgrmManage_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/config/postgresql/EgovProgrmManage_SQL_Postgresql.xml index 86928502..43a80acd 100644 --- a/src/main/resources/egovframework/sqlmap/config/postgresql/EgovProgrmManage_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/config/postgresql/EgovProgrmManage_SQL_Postgresql.xml @@ -142,7 +142,7 @@ , PROGRM_HTML_FILE_ID AS progrmHtmlFileId , URL AS URL FROM LETTNPROGRMLIST - WHERE URL like CONCAT(#searchKeyword#,'%') + WHERE URL like CONCAT(CAST(#searchKeyword:VARCHAR# AS TEXT) || '%')