이호영 이호영 2025-06-24
Merge branch 'master' into 알림톡api
@1a5ecf869b569cd7d3ba4d640227c43ce6e06d1d
src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
--- src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
+++ src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
@@ -85,10 +85,11 @@
 		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 @@
 		boardVO.setRecordCountPerPage(100);
 						
 		map = bbsMngService.selectBoardArticlesWeb(boardVO, null);
-		
+		System.out.println("????????????????????????????????");
 		int totCnt = Integer.parseInt((String) map.get("resultCnt"));
 
 		paginationInfo.setTotalRecordCount(totCnt);
src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
+++ 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>
src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
--- src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ 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("http://localhost/publish/maintenance.html");
-    return;
-}
-%>
 
 </script>
 
src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
@@ -880,7 +880,7 @@
 											${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>
src/main/webapp/publish/css/content.css
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
@@ -1592,8 +1592,10 @@
 .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 @@
 .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));}
src/main/webapp/publish/css/popupLayer.css
--- src/main/webapp/publish/css/popupLayer.css
+++ 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;}
Add a comment
List