tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 알림톡api

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2025-09-03 15:05:10 +09:00
commit 715ec569d1
5 changed files with 353 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/egovframework/egovProps/globals_dev.properties
View File

@ -28,7 +28,7 @@ Globals.Env = dev
# mysql
Globals.DriverClassName=com.mysql.jdbc.Driver
Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_advc
Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
#Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon
Globals.UserName= mjonUr
Globals.Password= mjon!@#$

2
src/main/resources/egovframework/egovProps/globals_local.properties
View File

@ -28,7 +28,7 @@ Globals.Env = local
# mysql
Globals.DriverClassName=com.mysql.jdbc.Driver
Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_advc
Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
Globals.UserName= mjonUr
Globals.Password= mjon!@#$

95
src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPhoneAjax.jsp
View File

@ -4,7 +4,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<% pageContext.setAttribute("newLineChar", "\n"); %>
<div class="phone">
<!-- 탭스타일 -->
<div class="list_tab_wrap2 type5 kakao_rev_tab">
@ -17,22 +16,72 @@
</div>
<!--// 탭스타일 -->
<!-- 카카오 알림톡 미리보기 -->
<!-- 카카오 미리보기 -->
<!-- <div class="tab_phone current" id="tab_phone_1"> -->
<!-- <div class="phone_kakako friendtalk"> -->
<div class="tab_phone current kakao_wrap" id="tab_phone_1">
<!-- 알림톡 미리보기 -->
<c:if test="${msgType eq '8'}">
<div class="phone_kakako">
<div class="phoneIn">
<p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""></p>
<!-- 텍스트 미리보기 -->
<div class="text_preview">
<div class="allimtalk_title">
<img src="/publish/images/content/icon_allimtalk.png" alt="">
알림톡 도착
</div>
<div class="allimtalk_content">
<c:choose>
<c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
<p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
<p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
</c:when>
<c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
<div class="kakao_image">
<img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
</div>
</c:when>
</c:choose>
<p class="template_text">
<c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
</p>
<c:choose>
<c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
<p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
</c:when>
<c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
<p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
</c:when>
</c:choose>
<c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
<c:choose>
<c:when test="${templatInfoButtonList.name eq '채널 추가'}">
<button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button>
</c:when>
<c:otherwise>
<button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div>
<p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p>
</div>
</c:if>
<!-- 친구톡 미리보기 -->
<c:if test="${msgType eq '9'}">
<div class="phone_kakako friendtalk">
<div class="phoneIn">
<p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${searchVO.yellowId}"/></p>
<!-- 텍스트 미리보기 -->
<div class="text_preview">
<%--< div class="allimtalk_title">
<img src="/publish/images/content/icon_allimtalk.png" alt="">
<c:choose>
<c:when test="${msgType eq '8'}">알림톡 도착</c:when>
<c:when test="${msgType eq '9'}">친구톡 도착</c:when>
</c:choose>
</div> --%>
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
<p class="friend_talk_title"><span>(광고)</span></p>
</c:if>
@ -82,8 +131,10 @@
</div>
<p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p>
</div>
</c:if>
</div>
<!--// 카카오 알림톡 미리보기 -->
<!--// 카카오 미리보기 -->
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
<!-- 문자 미리보기 -->
@ -95,6 +146,11 @@
<p class="prev_p"><img src="/publish/images/search.png"> 문자내용</p>
<div class="text_length2 clearfix">
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
<c:choose>
<c:when test="${not empty fileInfos}">
<span class="msg_com msg_photo">그림</span>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
<span class="msg_com msg_short">단문</span>
@ -103,25 +159,9 @@
<span class="msg_com msg_long">장문</span>
</c:otherwise>
</c:choose>
<%-- <c:choose>
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt > 1}">
<span class="msg_com msg_short">단문</span>
<span class="msg_com msg_long">장문</span>
</c:when>
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt < 2
&& resultMsgDetail.bizKakaoResendType eq 'SMS'}">
<span class="msg_com msg_short">단문</span>
</c:when>
<c:otherwise>
<span class="msg_com msg_long">장문</span>
</c:otherwise>
</c:choose> --%>
</c:choose>
</c:if>
<!-- <div>
<span>글자크기</span>
<button type="button" onclick="changeFontSize('plus');"><img src="/publish/images/content/font_plus.png"></button>
<button type="button" onclick="changeFontSize('minus');"><img src="/publish/images/content/font_minus.png"></button>
</div> -->
</div>
<div class="text_preview">
<c:if test="${not empty fileInfos}">
@ -134,7 +174,6 @@
</div>
</c:if>
<div class="preview_auto">
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
<p class="ad_tit">(광고)</p>
</c:if>

108
src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp
View File

@ -17,18 +17,16 @@
</div>
<!--// 탭스타일 -->
<!-- 카카오 알림톡 미리보기 -->
<div class="tab_phone current kakao_wrap" id="tab_phone_1">
<div class="phone_kakako friendtalk">
<!-- 카카오 알림톡 미리보기 -->
<c:if test="${msgType eq '8'}">
<div class="phone_kakako">
<div class="phoneIn">
<div class="rev_pop_middle clearfix">
<fmt:parseDate value="${resultMsgDetail.reqDate}" var="parsedDate" pattern="yyyy-MM-dd HH:mm:ss.S"/>
<span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
<span class="msg_com msg_allimtalk">
<c:choose>
<c:when test="${msgType eq '8'}">알림톡</c:when>
<c:when test="${msgType eq '9'}">친구톡</c:when>
</c:choose>
알림톡
</span>
</div>
<!-- 텍스트 미리보기 -->
@ -36,10 +34,7 @@
<div class="text_preview">
<div class="allimtalk_title">
<img src="/publish/images/content/icon_allimtalk.png" alt="">
<c:choose>
<c:when test="${msgType eq '8'}">알림톡 도착</c:when>
<c:when test="${msgType eq '9'}">친구톡 도착</c:when>
</c:choose>
알림톡 도착
</div>
<div class="allimtalk_content">
<c:choose>
@ -53,9 +48,67 @@
</div>
</c:when>
</c:choose>
<p class="template_text">
<c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
</p>
<c:choose>
<c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}">
<p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p>
</c:when>
<c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}">
<p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p>
</c:when>
</c:choose>
<c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status">
<c:choose>
<c:when test="${templatInfoButtonList.name eq '채널 추가'}">
<button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button>
</c:when>
<c:otherwise>
<button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div>
</div>
<p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p>
</div>
</c:if>
<c:if test="${msgType eq '9'}">
<!-- 카카오 친구톡 미리보기 -->
<div class="phone_kakako friendtalk">
<div class="phoneIn">
<div class="rev_pop_middle clearfix">
<fmt:parseDate value="${resultMsgDetail.reqDate}" var="parsedDate" pattern="yyyy-MM-dd HH:mm:ss.S"/>
<span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
<span class="msg_com msg_allimtalk">
친구톡
</span>
</div>
<!-- 텍스트 미리보기 -->
<div class="rev_pop_txt">
<div class="text_preview">
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
<p class="friend_talk_title"><span>(광고)</span></p>
</c:if>
<div class="allimtalk_content">
<c:choose>
<c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}">
<p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p>
<p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p>
</c:when>
<c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}">
<div class="kakao_image">
<img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt="">
</div>
</c:when>
</c:choose>
<p class="template_text">
<c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/>
</p>
@ -90,8 +143,9 @@
</div>
<p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p>
</div>
</c:if>
</div>
<!--// 카카오 알림톡 미리보기 -->
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
<!-- 문자 미리보기 -->
@ -100,9 +154,13 @@
<!-- <div class="tab_phone" id="tab_phone_2" style="display:none" > -->
<div class="phoneIn">
<div>
<div class="text_length2 clearfix">
<div class="rev_pop_middle clearfix">
<span>발송일시 : <fmt:formatDate value="${parsedDate}" pattern="yyyy-MM-dd HH:mm:ss"/></span>
<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
<c:choose>
<c:when test="${not empty fileInfos}">
<span class="msg_com msg_photo" style="float:right;">그림</span>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}">
<span class="msg_com msg_short" style="float:right;">단문</span>
@ -111,25 +169,8 @@
<span class="msg_com msg_long" style="float:right;">장문</span>
</c:otherwise>
</c:choose>
<%-- <c:choose>
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt > 1}">
<span class="msg_com msg_short" style="float:right;">단문</span>
<span class="msg_com msg_long" style="float:right;">장문</span>
</c:when>
<c:when test="${resultMsgDetail.bizKakaoResendTypeCnt < 2
&& resultMsgDetail.bizKakaoResendType eq 'SMS'}">
<span class="msg_com msg_short" style="float:right;">단문</span>
</c:when>
<c:otherwise>
<span class="msg_com msg_long" style="float:right;">장문</span>
</c:otherwise>
</c:choose> --%>
</c:if>
<!-- <div>
<span>글자크기</span>
<button type="button" onclick="changeFontSize('plus');"><img src="/publish/images/content/font_plus.png"></button>
<button type="button" onclick="changeFontSize('minus');"><img src="/publish/images/content/font_minus.png"></button>
</div> -->
</c:choose>
</div>
<div class="text_preview">
<c:if test="${not empty fileInfos}">
@ -141,12 +182,11 @@
</c:forEach>
</div>
</c:if>
<div class="preview_auto">
<div class="rev_pop_txt">
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
<p class="ad_tit">(광고)</p>
</c:if>
<p class="realtime">${fn:replace(resultMsgDetail.bizKakaoResendOrgnlTxt, newLineChar, "<br/>")}</p>
<p class="realtime">${fn:replace(resultMsgDetail.smsTxt, newLineChar, "<br/>")}</p>
<c:if test="${resultMsgDetail.adFlag eq 'Y'}">
<p class="deny_receipt">무료거부 0808800858</p>

13
src/main/webapp/publish/css/popupLayer.css
View File

@ -512,8 +512,7 @@
/* 예약관리 */
/* 예약관리 - 문자내용 */
.rev_pop_in input[type="text"] {background-color: #f2f2f2; width: 100%; height: 50px; border-radius: 5px;}
.rev_pop_in input[type="text"]::placeholder {font-size: 17px; color: #222; font-weight: 400
;}
.rev_pop_in input[type="text"]::placeholder {font-size: 17px; color: #222; font-weight: 400;}
.rev_pop_in input[type="text"]-ms-input-placeholder {font-size: 17px; color: #222; font-weight: 400;}
.rev_pop_middle {margin:0 0 10px;}
.rev_pop_middle span:first-child {float: left; font-size: 16px; font-weight: 300; padding-top: 5px;}
@ -1077,6 +1076,7 @@
.kakao_rev_popup .kakao_wrap .allimtalk_title::after{position: absolute; content: " "; width: 42px; height: 42px; background: url(/publish/images/content/icon_kakao01.png) no-repeat; right: -20px; top: -10px;}
.kakao_rev_popup .kakao_wrap .allimtalk_title img{margin: 0 8px 0 0; vertical-align: bottom;}
.kakao_rev_popup .kakao_wrap .allimtalk_content{width: calc(100% - 60px);background-color: #fff; border-radius: 0 0 5px 5px; padding: 0 0 10px 0; margin: 0 0 20px 0;}
.kakao_rev_popup .kakao_wrap .friendtalk .allimtalk_content{margin:0;}
.kakao_rev_popup .kakao_wrap .allimtalk_content .kakao_image img{width: 100%;}
.kakao_rev_popup .kakao_wrap .allimtalk_content p{width: calc(100% - 20px); white-space: normal; word-break: break-all; line-height: 1.4; padding: 0 10px; margin: 0 auto;}
.kakao_rev_popup .kakao_wrap .allimtalk_content .template_text,.kakao_rev_popup .kakao_wrap .allimtalk_content .emphasis_title_text{font-size: 16px; font-weight: 500; color: #222;}
@ -1091,6 +1091,15 @@
.kakao_rev_popup .kakao_wrap .allimtalk_content .template_text+.btn_kakao_type{margin-top: 8px;}
.kakao_rev_popup .kakao_wrap .allimtalk_content .btn_kakao_channel{width: calc(100% - 20px); height: 40px; font-size: 15px; border-radius: 5px; background-color: #ffea00;}
.kakao_rev_popup .kakao_wrap .allimtalk_content .btn_kakao_type{width: calc(100% - 20px); height: 40px; font-size: 15px; border-radius: 5px; background-color: #ededed;}
.kakao_rev_popup .tab_phone .addText{margin:8px 0 0 0;color:#002c9a;font-size:14px;}
/* 카카오톡 발송결과, 예약관리 문자내용 보기 - 친구톡 */
.kakao_rev_popup .kakao_wrap .friendtalk .allimtalk_content{border-radius:5px;}
.kakao_rev_popup .kakao_wrap .friendtalk .kakao_image{border-radius:5px 5px 0 0;overflow:hidden;}
.kakao_rev_popup .kakao_wrap .friendtalk .rev_pop_txt{padding:20px;}
.kakao_rev_popup .kakao_wrap .friendtalk .rev_pop_txt p {margin:0 0 10px 0;font-size: 15px;color:#777;}
.kakao_rev_popup .kakao_wrap .friendtalk .rev_pop_txt .template_text{padding:10px 10px 0 10px;}
.kakao_rev_popup .kakao_wrap .friendtalk .rev_pop_txt p.kakao_block_text{width:calc(100% - 60px);text-align:right;font-size:13px;color:#555;font-weight:300;margin:10px 0 0 0;}
/* 카카오테스트발송 팝업 */
.test_sendpop.kakao_rev_popup .kakao_wrap .phone .phoneIn{height: 620px; background-image: url(/publish/images/content/kakaoBg.png);padding: 28px 19px 0 19px;}