From 2e2d604ae2a16b812b1cabe235588f9eec619527 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Sat, 21 Jun 2025 22:35:24 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=EC=9E=91=EC=97=85=20=ED=91=9C=EC=8B=9C=20u?=
 =?UTF-8?q?rl=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
index 32239266..462541f5 100644
--- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
@@ -22,7 +22,7 @@ if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientI
 log("clientIp :: " + clientIp); // JSP 내장 메서드
 
 if (!"119.193.215.98".equals(clientIp)) {
-    response.sendRedirect("http://localhost/publish/maintenance.html");
+    response.sendRedirect("https://www.munjaon.co.kr/publish/maintenance.html");
     return;
 }
 %>

From 123b1c4b625e7fe4187dfe1d38d5930dbfcd947d Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Sun, 22 Jun 2025 12:09:23 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EB=B0=9C=EC=86=A1?=
 =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EB=AC=B4=EB=A3=8C=20=EA=B1=B0=EB=B6=80=20?=
 =?UTF-8?q?0808800858=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
index cc1f36cb..d5cacb19 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
@@ -880,7 +880,7 @@ function getAddrGroupListShow(jsonList) {
 											${fn:replace(result.smsTxt, newLineChar, "<br/>")}
 										</p>
 										<c:if test="${result.msgKind eq 'A' }" >
-											<p class="deny_receipt">무료 거부 080-0000-0000</p>
+											<p class="deny_receipt">무료 거부 0808800858</p>
 										</c:if>
 									</div>
 								</div>

From e64695cd124b6e7410b175dee8b2cd9840d979c1 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Sun, 22 Jun 2025 14:11:48 +0900
Subject: [PATCH 3/6] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EB=B0=9C?=
 =?UTF-8?q?=EC=86=A1=EA=B2=B0=EA=B3=BC=20=EB=8C=80=EC=B2=B4=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=20=EB=85=B8=EC=B6=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
index adaf023b..9e5eee73 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
@@ -77,7 +77,8 @@
 
 	<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
     <!-- 문자 미리보기 -->
-	    <div class="tab_phone" id="tab_phone_2">
+<!-- 	    <div class="tab_phone" id="tab_phone_2" > -->
+	    <div class="tab_phone" id="tab_phone_2" style="display:none" >
 	        <div class="phoneIn">
 	            <div>
 	                <p class="prev_p"><img src="/publish/images/search.png"> 문자내용</p>

From 759f7a3dc42cc9def02dc3a1ad9843b4f655206f Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Sun, 22 Jun 2025 14:27:48 +0900
Subject: [PATCH 4/6] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20faq=20key?=
 =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/kakao/user/stepInfo/web/KakaoStepInfoController.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
index e33d5ca1..50d04c07 100644
--- a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
+++ b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
@@ -85,10 +85,11 @@ public class KakaoStepInfoController {
 		String bbsId = "";
 		
 		String serverName = request.getServerName();//URL 도메인정보 받아오기
+		System.out.println("serverName : "+ serverName);
 		if(serverName.equals("www.munjaon.co.kr")) {//운영서버 카카오 사용안내 FAQ 게시판 번호 셋팅해주기
 			bbsId = "BBSMSTR_000000000782";
 		}else {//개발서버 카카오 사용안내 FAQ 게시판 번호 셋팅해주기
-			bbsId = "BBSMSTR_000000000791";
+			bbsId = "BBSMSTR_000000000782";
 		}
 		
 		boardVO.setBbsId(bbsId);
@@ -113,7 +114,7 @@ public class KakaoStepInfoController {
 		boardVO.setRecordCountPerPage(100);
 						
 		map = bbsMngService.selectBoardArticlesWeb(boardVO, null);
-		
+		System.out.println("????????????????????????????????");
 		int totCnt = Integer.parseInt((String) map.get("resultCnt"));
 
 		paginationInfo.setTotalRecordCount(totCnt);

From 2a63bf5a583398adccc35ad4b3307183f185c363 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Sun, 22 Jun 2025 15:32:34 +0900
Subject: [PATCH 5/6] =?UTF-8?q?Redirect=20/publish/maintenance.html=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
index 462541f5..67a8ebf0 100644
--- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
@@ -13,19 +13,6 @@
 <script src="/publish/js/swiper.min.js"></script>
 
 <script type="text/javascript">
-<%
-String clientIp = request.getHeader("X-Forwarded-For");
-if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
-    clientIp = request.getRemoteAddr();
-} 
-
-log("clientIp :: " + clientIp); // JSP 내장 메서드
-
-if (!"119.193.215.98".equals(clientIp)) {
-    response.sendRedirect("https://www.munjaon.co.kr/publish/maintenance.html");
-    return;
-}
-%>
 
 </script>
 

From cfad0ac7dc5e189c8dda83683d91fe3797140fe1 Mon Sep 17 00:00:00 2001
From: subsub <subsub8729@kakao.com>
Date: Mon, 23 Jun 2025 14:26:46 +0900
Subject: [PATCH 6/6] =?UTF-8?q?=EC=B9=9C=EA=B5=AC=ED=86=A1=20>=20=ED=85=9C?=
 =?UTF-8?q?=ED=94=8C=EB=A6=BF=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EB=84=98=EC=96=B4=EA=B0=80?=
 =?UTF-8?q?=EB=8A=94=20=EA=B1=B0=20=EC=88=98=EC=A0=95,=20=EC=B9=9C?=
 =?UTF-8?q?=EA=B5=AC=ED=86=A1=20>=20=ED=85=9C=ED=94=8C=EB=A6=BF=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=A0=88=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/publish/css/content.css    | 8 +++++---
 src/main/webapp/publish/css/popupLayer.css | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css
index 8ed31dad..a9c07c5d 100644
--- a/src/main/webapp/publish/css/content.css
+++ b/src/main/webapp/publish/css/content.css
@@ -1592,8 +1592,10 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 .kakaotalkset_cont .list_info .btn_list{background-image: url(/publish/images/btn_list_icon.png);}
 .kakaotalkset_cont .list_info .btn_thumbnail{background-image: url(/publish/images/btn_thumbnail_icon.png);}
 .kakaotalkset_cont .list_info .btnType8{width: 140px;}
-.kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;}
-.kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;}
+/* .kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;} */
+.kakaotalkset_cont .kakao_template_list{display:flex;gap:30px 13px;flex-wrap:wrap;margin:20px 0 0 0;}
+/* .kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;} */
+.kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 105px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px;}
 .kakaotalkset_cont .kakao_template_list li.template_none{box-shadow: none; width: 100%; text-align: center; font-size: 18px; font-weight: 400;}
 .kakaotalkset_cont .kakao_template_list li.template_none::after{display: none;}
 .kakaotalkset_cont .kakao_template_list li:nth-child(4n){margin: 0 0 0 0;}
@@ -1727,7 +1729,7 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 .kakao_wrap .send_right .phone .phoneIn .template_info_wrap{display: flex; width: calc(100% + 13px); height: auto; padding: 6px 15px 6px 23px; justify-content: space-between; align-items: center; background-color: #fae100; margin: -5px 0 0 -5.1px; border-radius: 0 0 25px 25px;}
 .kakao_wrap .send_right .phone .phoneIn .template_info_wrap .btn_template_choice{width: 120px; height: 36px; font-size: 16px; color: #fae100; background-color: #302218; border-radius: 5px;}
 .kakao_wrap .send_right .phone .addText{padding-top: 0; margin-top: -20px;}
-.kakaotalkset_cont .kakao_wrap .send_right .phone_bottom{position: relative; width: calc(100% - 10px); margin: 39px 0 0 10px;}
+.kakaotalkset_cont .kakao_wrap .send_right .phone_bottom{position: relative; width: calc(100% - 10px); margin: 39px 0 0 10px; bottom: 0;}
 .kakaotalkset_cont .kakao_wrap .send_right .phone_bottom button{width: calc((100% - 16px)/2); margin: 0 8px 0 0;}
 .kakaotalkset_cont .kakao_wrap .send_right .phone_bottom button:last-child{margin: 0 0 0 0;}
 .kakaotalkset_cont .kakao_wrap .send_right .phone_bottom .cancel{width: calc((100% - 10px));}
diff --git a/src/main/webapp/publish/css/popupLayer.css b/src/main/webapp/publish/css/popupLayer.css
index 37579626..29ef16ff 100644
--- a/src/main/webapp/publish/css/popupLayer.css
+++ b/src/main/webapp/publish/css/popupLayer.css
@@ -1046,8 +1046,10 @@
 .template_choice_popup .template_type{width: 180px;}
 .template_choice_popup .emphasis_type{width: 180px;}
 .template_choice_popup .popup_search_wrap .template_name{width: 300px;}
-.template_choice_popup .kakao_template_list{margin: 20px 0 0 0;}
-.template_choice_popup .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 80px)/3); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 11px 40px 0;}
+/* .template_choice_popup .kakao_template_list{margin: 20px 0 0 0;} */
+.template_choice_popup .kakao_template_list{display:flex;flex-wrap:wrap;gap:30px 16px;margin:20px 0;}
+/* .template_choice_popup .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 80px)/3); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 11px 40px 0;} */
+.template_choice_popup .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 80px)/3); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px;}
 .template_choice_popup .kakao_template_list li:nth-child(3n){margin: 0 0 0 0;}
 .template_choice_popup .kakao_template_list li::after{position: absolute; content: " "; width: 100%; height: 18px; background: url(/publish/images/kakao_template_cont.png) no-repeat top center; top: 8px;}
 .template_choice_popup .kakao_template_list .kakao_template_wrap{width: 100%; height: 370px; padding: 30px 0 15px 0; border-radius: 22px 22px 0 0; box-shadow: inset 0 2px 8px rgba(0,0,0,0.2); background: #b6cddd; overflow-y: auto; box-sizing: border-box;}
@@ -1056,6 +1058,7 @@
 .template_choice_popup .kakao_template_list .template_cont .title .check{position: absolute; left: 15px; top: -2px;}
 .template_choice_popup .kakao_template_list .template_cont .img_box img{width: 100%; height: auto;}
 .template_choice_popup .kakao_template_list .template_cont .text_box{font-size: 14px; color: #555; line-height: 1.4; padding: 20px;}
+.template_choice_popup .kakao_template_list .template_cont .text_box p{word-break:break-all;}
 .template_choice_popup .kakao_template_list .kakao_template_info{ font-size: 14px; color: #555; padding: 10px 0 0 10px;}
 .template_choice_popup .kakao_template_list .kakao_template_info dl{display: flex; padding: 6px 0;}
 .template_choice_popup .kakao_template_list .kakao_template_info dt{position: relative; width: 76px; margin: 0 13px 0 0;}