Commit @d95ee8757087e684483d79abc8b69743db50ef53

3f68d80

d95ee87

.claude/.gitignore

--- .claude/.gitignore

+++ .claude/.gitignore

...	...	@@ -1,1 +1,2 @@
1	1	/settings.local.json
	2	+/mcp_settings.json

3f68d80

d95ee87

pom.xml

--- pom.xml

+++ pom.xml


         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.31</version>
+            <version>5.1.49</version>
         </dependency>
 
 		<!-- oracle 10g driver -->

3f68d80

d95ee87

src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java

--- src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java

+++ src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java


 
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import itn.com.cmm.util.StringUtil;
 import itn.com.cmm.util.StringUtil2;
 import itn.let.cmm.vo.FileInfoVO;
 import itn.let.fax.addr.service.FaxAddrGroupVO;

 
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		
+		//수신번호 검색 시 번호 포멧 통일
+		if("4".equals(mjonMsgSentVO.getSearchCondition()) && StringUtil.isNotEmpty(mjonMsgSentVO.getSearchKeyword())) {
+			mjonMsgSentVO.setSearchKeyword(mjonMsgSentVO.getSearchKeyword().trim().replace("-", ""));
+		}
+		
 		// 목록
 		List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
 

3f68d80

d95ee87

src/main/resources/egovframework/egovProps/globals_dev.properties

--- src/main/resources/egovframework/egovProps/globals_dev.properties

+++ src/main/resources/egovframework/egovProps/globals_dev.properties


 
 # mysql
 Globals.DriverClassName=com.mysql.jdbc.Driver
-Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
+Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
 #Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon
 Globals.UserName= mjonUr
 Globals.Password= mjon!@#$

3f68d80

d95ee87

src/main/resources/egovframework/egovProps/globals_local.properties

--- src/main/resources/egovframework/egovProps/globals_local.properties

+++ src/main/resources/egovframework/egovProps/globals_local.properties


 
 # mysql
 Globals.DriverClassName=com.mysql.jdbc.Driver
-Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
-#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
+#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
+#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?characterEncoding=UTF-8&useUnicode=true&serverTimezone=Asia/Seoul
+Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
+
 Globals.UserName= mjonUr
 Globals.Password= mjon!@#$
 #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon

3f68d80

d95ee87

src/main/resources/egovframework/egovProps/globals_prod.properties

--- src/main/resources/egovframework/egovProps/globals_prod.properties

+++ src/main/resources/egovframework/egovProps/globals_prod.properties


 
 # mysql
 Globals.DriverClassName=com.mysql.jdbc.Driver
-Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc
+Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
 Globals.UserName= mjonUr
 Globals.Password= mjon!@#$
 

3f68d80

d95ee87

src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml


 				       C.YELLOW_ID                 AS yellowId
 				FROM MJ_MSG_GROUP_DATA B
 			         INNER JOIN (
-					         select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA
+					         select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA, CALL_TO
 						      from MJ_MSG_DATA
 						      where DEL_FLAG = 'N'
 						        <isNotEmpty property="tabType">

 					<isEqual property="searchCondition" compareValue="3">
 						AND  B.SMS_TXT like CONCAT('%', #searchKeyword#, '%')
 					</isEqual>
+					<isEqual property="searchCondition" compareValue="4" >
+						AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
+					</isEqual>
 				</isNotEmpty>
 				GROUP BY B.MSG_GROUP_ID
 				ORDER BY 1=1

3f68d80

d95ee87

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml


 					<isEqual property="searchCondition" compareValue="3" >
 						AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
 					</isEqual>
+					<isEqual property="searchCondition" compareValue="4" >
+						AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
+					</isEqual>
 				</isNotEmpty>
 				<isNotEmpty property="searchCondition01">
 					AND B.RESERVE_YN = #searchCondition01#

 				<isEqual property="searchCondition" compareValue="3" >
 					AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
 				</isEqual>
+				<isEqual property="searchCondition" compareValue="4" >
+					AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
+				</isEqual>
 			</isNotEmpty>
 			<isNotEmpty property="searchCondition01">
 				AND B.RESERVE_YN = #searchCondition01#

3f68d80

d95ee87

src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomPopupAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomPopupAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomPopupAjax.jsp


 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 
 <head>
+<style>
+	.custom_layer .body_cont table tr.custom_put1 td .custom_put1_txt{margin:8px 0 0 0;}
+	.custom_layer .body_cont table tr.custom_put1 td .custom_put1_txt p{line-height:1.2;}
+	.custom_layer .body_cont table tr.custom_put1 td .custom_put1_txt p:first-child{margin:0;}
+</style>
 <script type="text/javascript">
 $(document).ready(function(){
 	$("input:text[numberOnly]").on("keyup", function() {

 								</div>
 								<div class="custom_put1_txt">
 									<p><span class="vMiddle">*</span> <span class="c_e40000">캘리그래피체는 수정이 불가</span>합니다.</p>
-									<p><span class="vMiddle">*</span> <spanspan class="c_e40000">제작형태와 요청사항이 상이</span>한 경우 <spanspan class="c_e40000">추가로 비용이 발생</span>할 수 있습니다.</p>
+									<p><span class="vMiddle">*</span> <span class="c_e40000">제작형태와 요청사항이 상이</span>한 경우 <span class="c_e40000">추가로 비용이 발생</span>할 수 있습니다.</p>
+									<p><span class="vMiddle">*</span> <span class="c_e40000">제작된 이미지는 <span class="c_e40000">알림톡 및 친구톡</span> 발송에는 사용할 수 없습니다.</p>
 								</div>
 								</td>
 							</tr>

 								<th>제공방법</th>
 								<td>
 									<input type="checkbox" id="storage" checked="checked" disabled="disabled"> <label for="storage">내보관함</label>
-									<input type="checkbox" name="customProvision" id="radio11" value="01"> <label for="radio11">카카오톡</label>
+									<input type="checkbox" name="customProvision" id="radio11" value="01"> <label for="radio11">문자</label>
 									<input type="checkbox" name="customProvision" id="radio12" value="02"> <label for="radio12">이메일</label>
 									<input type="text" class="radio12_input" name="customResultEmail" placeholder="이메일주소를 입력해주세요" onfocus="''" onblur="this.placeholder='이메일주소를 입력해주세요'">
 <!-- 									<span>중복선택 가능(최대2개)</span> -->

3f68d80

d95ee87

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp


 							<select name="searchCondition" id="searchCondition" class="selType2">
 <%-- 								<option value="4" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >채널ID</option> --%>
 								<option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >내용</option>
+								<option value="4" <c:if test="${kakaoSentVO.searchCondition == '4'}">selected</c:if> >수신번호</option>
 <%-- 								<option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option> --%>
 							</select>
 							<div class="search">

3f68d80

d95ee87

src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateRegist.jsp


 		
 	}
 	
-	if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){
+	/* if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){
 		return false;
-	}
+	} */
 	
 	
 	var data = new FormData(bizForm);

3f68d80

d95ee87

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp


 									<button type="button" class="btnType6" onClick="javascript:fnSearch(1); return false;">조회</button>
 								</div>
 								<div class="btn_right">
-									<label for="searchCondition" class="label">검색 조건: ${mjonMsgSentVO.searchCondition == '2' ? '발신번호' : '문자내용'}</label>
+									<label for="searchCondition" class="label">검색 조건: ${mjonMsgSentVO.searchCondition == '2' ? '발신번호' : mjonMsgSentVO.searchCondition == '3' ? '문자내용' : '수신번호'}</label>
 									<select name="searchCondition" id="searchCondition" class="selType2 select_btn">
 										<option value="2" <c:if test="${mjonMsgSentVO.searchCondition == '2'}">selected</c:if> >발신번호</option>
 										<option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >문자내용</option>
+										<option value="4" <c:if test="${mjonMsgSentVO.searchCondition == '4'}">selected</c:if> >수신번호</option>
 									</select>
 									<div class="search">
 										<label for="id" class="label"></label>

...	...	@@ -146,7 +146,7 @@
146	146	<dependency>
147	147	<groupId>mysql</groupId>
148	148	<artifactId>mysql-connector-java</artifactId>
149		- <version>5.1.31</version>
	149	+ <version>5.1.49</version>
150	150	</dependency>
151	151
152	152	<!-- oracle 10g driver -->

...	...	@@ -34,6 +34,7 @@
34	34
35	35	import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
36	36	import egovframework.rte.fdl.idgnr.EgovIdGnrService;
	37	+import itn.com.cmm.util.StringUtil;
37	38	import itn.com.cmm.util.StringUtil2;
38	39	import itn.let.cmm.vo.FileInfoVO;
39	40	import itn.let.fax.addr.service.FaxAddrGroupVO;
...	...	@@ -126,6 +127,11 @@
126	127
127	128	Map<String, Object> resultMap = new HashMap<String, Object>();
128	129
	130	+ //수신번호 검색 시 번호 포멧 통일
	131	+ if("4".equals(mjonMsgSentVO.getSearchCondition()) && StringUtil.isNotEmpty(mjonMsgSentVO.getSearchKeyword())) {
	132	+ mjonMsgSentVO.setSearchKeyword(mjonMsgSentVO.getSearchKeyword().trim().replace("-", ""));
	133	+ }
	134	+
129	135	// 목록
130	136	List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
131	137

...	...	@@ -1409,7 +1409,7 @@
1409	1409	C.YELLOW_ID AS yellowId
1410	1410	FROM MJ_MSG_GROUP_DATA B
1411	1411	INNER JOIN (
1412		- select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA
	1412	+ select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN, BIZ_KAKAO_RESEND_DATA, CALL_TO
1413	1413	from MJ_MSG_DATA
1414	1414	where DEL_FLAG = 'N'
1415	1415	<isNotEmpty property="tabType">
...	...	@@ -1452,6 +1452,9 @@
1452	1452	<isEqual property="searchCondition" compareValue="3">
1453	1453	AND B.SMS_TXT like CONCAT('%', #searchKeyword#, '%')
1454	1454	</isEqual>
	1455	+ <isEqual property="searchCondition" compareValue="4" >
	1456	+ AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
	1457	+ </isEqual>
1455	1458	</isNotEmpty>
1456	1459	GROUP BY B.MSG_GROUP_ID
1457	1460	ORDER BY 1=1

...	...	@@ -254,6 +254,9 @@
254	254	<isEqual property="searchCondition" compareValue="3" >
255	255	AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
256	256	</isEqual>
	257	+ <isEqual property="searchCondition" compareValue="4" >
	258	+ AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
	259	+ </isEqual>
257	260	</isNotEmpty>
258	261	<isNotEmpty property="searchCondition01">
259	262	AND B.RESERVE_YN = #searchCondition01#
...	...	@@ -473,6 +476,9 @@
473	476	<isEqual property="searchCondition" compareValue="3" >
474	477	AND B.SMS_TXT LIKE CONCAT('%', #searchKeyword#, '%')
475	478	</isEqual>
	479	+ <isEqual property="searchCondition" compareValue="4" >
	480	+ AND A.CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
	481	+ </isEqual>
476	482	</isNotEmpty>
477	483	<isNotEmpty property="searchCondition01">
478	484	AND B.RESERVE_YN = #searchCondition01#

...	...	@@ -535,6 +535,7 @@
535	535	<select name="searchCondition" id="searchCondition" class="selType2">
536	536	<%-- <option value="4" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >채널ID</option> --%>
537	537	<option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >내용</option>
	538	+ <option value="4" <c:if test="${kakaoSentVO.searchCondition == '4'}">selected</c:if> >수신번호</option>
538	539	<%-- <option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option> --%>
539	540	</select>
540	541	<div class="search">

...	...	@@ -28,7 +28,7 @@
28	28
29	29	# mysql
30	30	Globals.DriverClassName=com.mysql.jdbc.Driver
31		-Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
	31	+Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
32	32	#Globals.Url=jdbc:mysql://139.150.73.12:3306/mjon
33	33	Globals.UserName= mjonUr
34	34	Globals.Password= mjon!@#$

...	...	@@ -28,8 +28,10 @@
28	28
29	29	# mysql
30	30	Globals.DriverClassName=com.mysql.jdbc.Driver
31		-Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
32		-#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
	31	+#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc
	32	+#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?characterEncoding=UTF-8&useUnicode=true&serverTimezone=Asia/Seoul
	33	+Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
	34	+
33	35	Globals.UserName= mjonUr
34	36	Globals.Password= mjon!@#$
35	37	#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon

...	...	@@ -27,7 +27,7 @@
27	27
28	28	# mysql
29	29	Globals.DriverClassName=com.mysql.jdbc.Driver
30		-Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc
	30	+Globals.Url=jdbc:mysql://10.12.107.14:3306/mjon_advc?useUnicode=true&connectionCollation=utf8mb4_unicode_ci&serverTimezone=Asia/Seoul
31	31	Globals.UserName= mjonUr
32	32	Globals.Password= mjon!@#$
33	33

...	...	@@ -5,6 +5,11 @@
5	5	<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
6	6
7	7	<head>
	8	+<style>
	9	+ .custom_layer .body_cont table tr.custom_put1 td .custom_put1_txt{margin:8px 0 0 0;}
	10	+ .custom_layer .body_cont table tr.custom_put1 td .custom_put1_txt p{line-height:1.2;}
	11	+ .custom_layer .body_cont table tr.custom_put1 td .custom_put1_txt p:first-child{margin:0;}
	12	+</style>
8	13	<script type="text/javascript">
9	14	$(document).ready(function(){
10	15	$("input:text[numberOnly]").on("keyup", function() {
...	...	@@ -410,7 +415,8 @@
410	415	</div>
411	416	<div class="custom_put1_txt">
412	417	<p><span class="vMiddle">*</span> <span class="c_e40000">캘리그래피체는 수정이 불가</span>합니다.</p>
413		- <p><span class="vMiddle">*</span> <spanspan class="c_e40000">제작형태와 요청사항이 상이</span>한 경우 <spanspan class="c_e40000">추가로 비용이 발생</span>할 수 있습니다.</p>
	418	+ <p><span class="vMiddle">*</span> <span class="c_e40000">제작형태와 요청사항이 상이</span>한 경우 <span class="c_e40000">추가로 비용이 발생</span>할 수 있습니다.</p>
	419	+ <p><span class="vMiddle">*</span> <span class="c_e40000">제작된 이미지는 <span class="c_e40000">알림톡 및 친구톡</span> 발송에는 사용할 수 없습니다.</p>
414	420	</div>
415	421	</td>
416	422	</tr>
...	...	@@ -418,7 +424,7 @@
418	424	<th>제공방법</th>
419	425	<td>
420	426	<input type="checkbox" id="storage" checked="checked" disabled="disabled"> <label for="storage">내보관함</label>
421		- <input type="checkbox" name="customProvision" id="radio11" value="01"> <label for="radio11">카카오톡</label>
	427	+ <input type="checkbox" name="customProvision" id="radio11" value="01"> <label for="radio11">문자</label>
422	428	<input type="checkbox" name="customProvision" id="radio12" value="02"> <label for="radio12">이메일</label>
423	429	<input type="text" class="radio12_input" name="customResultEmail" placeholder="이메일주소를 입력해주세요" onfocus="''" onblur="this.placeholder='이메일주소를 입력해주세요'">
424	430	<!-- <span>중복선택 가능(최대2개)</span> -->

...	...	@@ -536,9 +536,9 @@
536	536
537	537	}
538	538
539		- if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){
	539	+ /* if(!kakaoTemplateEmojiCheck(bizForm.templateContent.value)){
540	540	return false;
541		- }
	541	+ } */
542	542
543	543
544	544	var data = new FormData(bizForm);

...	...	@@ -888,10 +888,11 @@
888	888	<button type="button" class="btnType6" onClick="javascript:fnSearch(1); return false;">조회</button>
889	889	</div>
890	890	<div class="btn_right">
891		- <label for="searchCondition" class="label">검색 조건: ${mjonMsgSentVO.searchCondition == '2' ? '발신번호' : '문자내용'}</label>
	891	+ <label for="searchCondition" class="label">검색 조건: ${mjonMsgSentVO.searchCondition == '2' ? '발신번호' : mjonMsgSentVO.searchCondition == '3' ? '문자내용' : '수신번호'}</label>
892	892	<select name="searchCondition" id="searchCondition" class="selType2 select_btn">
893	893	<option value="2" <c:if test="${mjonMsgSentVO.searchCondition == '2'}">selected</c:if> >발신번호</option>
894	894	<option value="3" <c:if test="${mjonMsgSentVO.searchCondition == '3'}">selected</c:if> >문자내용</option>
	895	+ <option value="4" <c:if test="${mjonMsgSentVO.searchCondition == '4'}">selected</c:if> >수신번호</option>
895	896	</select>
896	897	<div class="search">
897	898	<label for="id" class="label"></label>

Delete comment