Merge branch 'hylee'

src/main/webapp/sample_mjon/jsp_example_hstry_detail_form_r1.jsp

@@ -47,7 +47,7 @@
 								$("span#pspe").text(returnData.pictureSendPsbltEa);
 								*/
 							}	else{								
-								alert(returnData.resultCode+" : "+returnData.message);
+								alert(returnData.resultCode+" : "+returnData.data);
 							}							
 							
 						},			     			

src/main/webapp/sample_mjon/jsp_example_hstry_r1.jsp

@@ -64,6 +64,7 @@
             
 		String result = "";
 		
+		
 		MultipartEntityBuilder builder = MultipartEntityBuilder.create();
 		
 		builder.setBoundary(boundary);

src/main/webapp/sample_mjon/jsp_example_select_price_form_r1.jsp

@@ -48,7 +48,7 @@
 								$("span#lspe").text(returnData.data.longSendPsbltEa);
 								$("span#pspe").text(returnData.data.pictureSendPsbltEa);
 							}	else{								
-								alert(returnData.resultCode+" : "+returnData.message);
+								alert(returnData.resultCode+" : "+returnData.data);
 							}							
 							
 						},			     			

src/main/webapp/sample_mjon/jsp_example_send_msg_form_r1.jsp

@@ -24,6 +24,7 @@
 			     				, 'p_callToList'	: $('#callToList').val()
 			     				, 'p_smsTxt'		: $('#smsTxt').val()
 			     				, 'p_nameStr'		: $('#nameStr').val()
+			     				, 'p_testYn'		: $('#testYn').val()
 			     				//, 'p_eachPrice'		: $('#eachPrice').val()
 			     				//, 'p_sPrice'		: $('#sPrice').val()
 			     							     				
@@ -40,6 +41,7 @@
 		     			data : searchWebParam,
 
 						success: function (returnData, status) {
+							console.log('returnData :: ', returnData);
 							
 							if (returnData.resultCode=="0"){
 								//makeResult(returnData);
@@ -51,7 +53,7 @@
 								$("span#mt").text(returnData.data.msgType);
 								
 							}	else{								
-								alert(returnData.resultCode+" : "+returnData.message);
+								alert(returnData.resultCode+" : "+returnData.data);
 							}							
 							
 						},			     			
@@ -175,6 +177,11 @@
 							<input type="text" class="list_inputType1" id="nameStr" maxlength="100" value="홍길동1|홍길동2|홍길동3"  size="100"/>
 						</div>
 					</div>
+					<div class="input_list_item">
+						<div class="input_left">테스트여부
+							<input type="text" class="list_inputType1" id="testYn" maxlength="100" value=""  size="100"/>(기본값 없음, YF-테스트(실패), YS-테스트(성공)
+						</div>
+					</div>
 					<!-- 
 					<div class="input_list_item">
 						<div class="input_left">eachPrice

src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp

@@ -72,6 +72,7 @@
 		//String p_msgKind	= "N";	//N-일반,A-광고,C-선거	-	초기 지원안함
 		String p_smsTxt		= request.getParameter("p_smsTxt");		//SMS용 메시지본문
 		String p_nameStr	= request.getParameter("p_nameStr");	//치환문자
+		String p_testYn		= request.getParameter("p_testYn");			//테스트데이터여부	'', 'YF', 'YS'
 				
 		//선택값
 		//String p_mmsPrice		= request.getParameter("p_mmsPrice");	//mms단가
@@ -92,6 +93,7 @@
 		//params.put("sPrice"		, p_sPrice);		//단문문자단가
 		params.put("smsTxt"		, p_smsTxt);		//SMS용 메시지본문
 		params.put("nameStr"	, p_nameStr);		//페이지당 출력갯수
+		params.put("test_yn"	, p_testYn);			//테스트 여부
 		
             
 		String result = "";

src/main/webapp/sample_mjon/jsp_example_send_msgs_form_r1.jsp

@@ -21,6 +21,7 @@
 			     				, 'p_apiKey'		: $('#apiKey').val()
 			     				
 			     				, 'p_callFrom'		: $('#callFrom').val()
+			     				, 'p_testYn'		: $('#testYn').val()
 			     							     				
 						};
 
@@ -54,7 +55,7 @@
 								$("span#mt").text(returnData.data.msgType);
 								
 							}	else{								
-								alert(returnData.resultCode+" : "+returnData.message);
+								alert(returnData.resultCode+" : "+returnData.data);
 							}							
 							
 						},			     			
@@ -138,7 +139,11 @@
 							<input type="text" class="list_inputType1" id="callFrom" maxlength="100" value="01035520132"  size="100"/>
 						</div>
 					</div>
-					
+					<div class="input_list_item">
+						<div class="input_left">테스트여부
+							<input type="text" class="list_inputType1" id="testYn" maxlength="100" value=""  size="100"/>(기본값 없음, YF-테스트(실패), YS-테스트(성공)
+						</div>
+					</div>
 					<div class="input_list_item">
 						<div class="input_left">p_callTo_1
 							<input type="text" class="list_inputType1 callTo" id="p_callTo_1" maxlength="100" value="01083584250">
@@ -148,7 +153,7 @@
 						<div class="input_left">p_smsTxt_1
 							<input type="text" class="list_inputType1 smsTxt" id="p_smsTxt_1" maxlength="100" value="testMsg">
 						</div>
-					</div>					
+					</div>
 				</div>									
 			</div>	
 			

src/main/webapp/sample_mjon/jsp_example_send_msgs_r1.jsp

@@ -71,6 +71,7 @@
 		//String p_msgKind	= request.getParameter("p_msgKind");	//N-일반,A-광고,C-선거
 		//String p_msgKind	= "N";	//N-일반,A-광고,C-선거	-	초기 지원안함
 		String p_smsTxt_1	= request.getParameter("p_smsTxt_1");		//SMS용 메시지본문
+		String p_testYn		= request.getParameter("p_testYn");			//테스트데이터여부	'', 'YF', 'YS'
 		//String p_nameStr_1	= request.getParameter("p_nameStr_1");	//치환문자
 				
 		//선택값
@@ -87,6 +88,7 @@
 		
 		//추가 전송 데이터
 		params.put("callFrom"	, p_callFrom);		//발신번호
+		params.put("test_yn"	, p_testYn);			//테스트 여부
 		
 		//params.put("callTo_1"	, p_callTo_1);	//수신번호
 		//params.put("eachPrice"	, p_eachPrice);		//전송문자 개별가격    

src/main/webapp/sample_mjon/jsp_example_start_form_r1.jsp

@@ -54,7 +54,7 @@
 								$("span#mt").text(returnData.data.msgType);
 								
 							}	else{								
-								alert(returnData.resultCode+" : "+returnData.message);
+								alert(returnData.resultCode+" : "+returnData.data);
 							}							
 							
 						},