--- 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 @@ |
| 85 | 85 |
String bbsId = ""; |
| 86 | 86 |
|
| 87 | 87 |
String serverName = request.getServerName();//URL 도메인정보 받아오기 |
| 88 |
+ System.out.println("serverName : "+ serverName);
|
|
| 88 | 89 |
if(serverName.equals("www.munjaon.co.kr")) {//운영서버 카카오 사용안내 FAQ 게시판 번호 셋팅해주기
|
| 89 | 90 |
bbsId = "BBSMSTR_000000000782"; |
| 90 | 91 |
}else {//개발서버 카카오 사용안내 FAQ 게시판 번호 셋팅해주기
|
| 91 |
- bbsId = "BBSMSTR_000000000791"; |
|
| 92 |
+ bbsId = "BBSMSTR_000000000782"; |
|
| 92 | 93 |
} |
| 93 | 94 |
|
| 94 | 95 |
boardVO.setBbsId(bbsId); |
... | ... | @@ -113,7 +114,7 @@ |
| 113 | 114 |
boardVO.setRecordCountPerPage(100); |
| 114 | 115 |
|
| 115 | 116 |
map = bbsMngService.selectBoardArticlesWeb(boardVO, null); |
| 116 |
- |
|
| 117 |
+ System.out.println("????????????????????????????????");
|
|
| 117 | 118 |
int totCnt = Integer.parseInt((String) map.get("resultCnt"));
|
| 118 | 119 |
|
| 119 | 120 |
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
... | ... | @@ -77,7 +77,8 @@ |
| 77 | 77 |
|
| 78 | 78 |
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
|
| 79 | 79 |
<!-- 문자 미리보기 --> |
| 80 |
- <div class="tab_phone" id="tab_phone_2"> |
|
| 80 |
+<!-- <div class="tab_phone" id="tab_phone_2" > --> |
|
| 81 |
+ <div class="tab_phone" id="tab_phone_2" style="display:none" > |
|
| 81 | 82 |
<div class="phoneIn"> |
| 82 | 83 |
<div> |
| 83 | 84 |
<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
... | ... | @@ -13,19 +13,6 @@ |
| 13 | 13 |
<script src="/publish/js/swiper.min.js"></script> |
| 14 | 14 |
|
| 15 | 15 |
<script type="text/javascript"> |
| 16 |
-<% |
|
| 17 |
-String clientIp = request.getHeader("X-Forwarded-For");
|
|
| 18 |
-if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
|
|
| 19 |
- clientIp = request.getRemoteAddr(); |
|
| 20 |
-} |
|
| 21 |
- |
|
| 22 |
-log("clientIp :: " + clientIp); // JSP 내장 메서드
|
|
| 23 |
- |
|
| 24 |
-if (!"119.193.215.98".equals(clientIp)) {
|
|
| 25 |
- response.sendRedirect("http://localhost/publish/maintenance.html");
|
|
| 26 |
- return; |
|
| 27 |
-} |
|
| 28 |
-%> |
|
| 29 | 16 |
|
| 30 | 17 |
</script> |
| 31 | 18 |
|
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentDetailView.jsp
... | ... | @@ -880,7 +880,7 @@ |
| 880 | 880 |
${fn:replace(result.smsTxt, newLineChar, "<br/>")}
|
| 881 | 881 |
</p> |
| 882 | 882 |
<c:if test="${result.msgKind eq 'A' }" >
|
| 883 |
- <p class="deny_receipt">무료 거부 080-0000-0000</p> |
|
| 883 |
+ <p class="deny_receipt">무료 거부 0808800858</p> |
|
| 884 | 884 |
</c:if> |
| 885 | 885 |
</div> |
| 886 | 886 |
</div> |
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
... | ... | @@ -1592,8 +1592,10 @@ |
| 1592 | 1592 |
.kakaotalkset_cont .list_info .btn_list{background-image: url(/publish/images/btn_list_icon.png);}
|
| 1593 | 1593 |
.kakaotalkset_cont .list_info .btn_thumbnail{background-image: url(/publish/images/btn_thumbnail_icon.png);}
|
| 1594 | 1594 |
.kakaotalkset_cont .list_info .btnType8{width: 140px;}
|
| 1595 |
-.kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;}
|
|
| 1596 |
-.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;}
|
|
| 1595 |
+/* .kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;} */
|
|
| 1596 |
+.kakaotalkset_cont .kakao_template_list{display:flex;gap:30px 13px;flex-wrap:wrap;margin:20px 0 0 0;}
|
|
| 1597 |
+/* .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;} */
|
|
| 1598 |
+.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;}
|
|
| 1597 | 1599 |
.kakaotalkset_cont .kakao_template_list li.template_none{box-shadow: none; width: 100%; text-align: center; font-size: 18px; font-weight: 400;}
|
| 1598 | 1600 |
.kakaotalkset_cont .kakao_template_list li.template_none::after{display: none;}
|
| 1599 | 1601 |
.kakaotalkset_cont .kakao_template_list li:nth-child(4n){margin: 0 0 0 0;}
|
... | ... | @@ -1727,7 +1729,7 @@ |
| 1727 | 1729 |
.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;}
|
| 1728 | 1730 |
.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;}
|
| 1729 | 1731 |
.kakao_wrap .send_right .phone .addText{padding-top: 0; margin-top: -20px;}
|
| 1730 |
-.kakaotalkset_cont .kakao_wrap .send_right .phone_bottom{position: relative; width: calc(100% - 10px); margin: 39px 0 0 10px;}
|
|
| 1732 |
+.kakaotalkset_cont .kakao_wrap .send_right .phone_bottom{position: relative; width: calc(100% - 10px); margin: 39px 0 0 10px; bottom: 0;}
|
|
| 1731 | 1733 |
.kakaotalkset_cont .kakao_wrap .send_right .phone_bottom button{width: calc((100% - 16px)/2); margin: 0 8px 0 0;}
|
| 1732 | 1734 |
.kakaotalkset_cont .kakao_wrap .send_right .phone_bottom button:last-child{margin: 0 0 0 0;}
|
| 1733 | 1735 |
.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
... | ... | @@ -1046,8 +1046,10 @@ |
| 1046 | 1046 |
.template_choice_popup .template_type{width: 180px;}
|
| 1047 | 1047 |
.template_choice_popup .emphasis_type{width: 180px;}
|
| 1048 | 1048 |
.template_choice_popup .popup_search_wrap .template_name{width: 300px;}
|
| 1049 |
-.template_choice_popup .kakao_template_list{margin: 20px 0 0 0;}
|
|
| 1050 |
-.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;}
|
|
| 1049 |
+/* .template_choice_popup .kakao_template_list{margin: 20px 0 0 0;} */
|
|
| 1050 |
+.template_choice_popup .kakao_template_list{display:flex;flex-wrap:wrap;gap:30px 16px;margin:20px 0;}
|
|
| 1051 |
+/* .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;} */
|
|
| 1052 |
+.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;}
|
|
| 1051 | 1053 |
.template_choice_popup .kakao_template_list li:nth-child(3n){margin: 0 0 0 0;}
|
| 1052 | 1054 |
.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;}
|
| 1053 | 1055 |
.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 @@ |
| 1056 | 1058 |
.template_choice_popup .kakao_template_list .template_cont .title .check{position: absolute; left: 15px; top: -2px;}
|
| 1057 | 1059 |
.template_choice_popup .kakao_template_list .template_cont .img_box img{width: 100%; height: auto;}
|
| 1058 | 1060 |
.template_choice_popup .kakao_template_list .template_cont .text_box{font-size: 14px; color: #555; line-height: 1.4; padding: 20px;}
|
| 1061 |
+.template_choice_popup .kakao_template_list .template_cont .text_box p{word-break:break-all;}
|
|
| 1059 | 1062 |
.template_choice_popup .kakao_template_list .kakao_template_info{ font-size: 14px; color: #555; padding: 10px 0 0 10px;}
|
| 1060 | 1063 |
.template_choice_popup .kakao_template_list .kakao_template_info dl{display: flex; padding: 6px 0;}
|
| 1061 | 1064 |
.template_choice_popup .kakao_template_list .kakao_template_info dt{position: relative; width: 76px; margin: 0 13px 0 0;}
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?