Merge remote-tracking branch 'origin/master'

WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp

@@ -298,7 +298,7 @@
             if(!isStandardMessage){
                 $(adapterSettings.adapterUrlId).text(adapterInfo.urlPath);
             } else {
-                $(adapterSettings.methodSelectId).val('');
+                //$(adapterSettings.methodSelectId).val('');
                 $(adapterSettings.restPathInputId).val('');
                 $(adapterSettings.adapterUrlId).text('');
             }
@@ -871,6 +871,10 @@
 			});
 			
             var postData = $('#ajaxForm').serializeArray();
+            
+            console.log('modify', postData);
+            console.log('method', $('#inboundHttpMethod').val());
+            
             if (isDetail){
                 postData.push({ name: "cmd" , value:"UPDATE"});
             }else{

src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java

@@ -31,7 +31,7 @@ public class InflowTokenService {
 
 		for (InflowTokenInsufficient info : rows) {
 			log.debug("유량제어 토큰 획득 실패: {}-{} 최근 {}분 동안 {}건", info.getEaisvcname(), info.getEaisvcdesc(), rangeMinute, info.getCnt());
-			String message = "유량제어 토큰 획득 실패하였습니다 \n" + info.getEaisvcname();
+			String message = "유량제어 토큰 획득 실패가 발생하였습니다 \n" + info.getEaisvcname();
 			HashMap<String,Object> params = new HashMap<String,Object>();
 			params.put("message", message);
 			ums.send("api-monitor", MessageCode.INFLOW_TOKEN_FAILED, params);

src/main/java/com/eactive/eai/rms/ext/djb/ums/service/UmsService.java

@@ -35,7 +35,11 @@ public class UmsService {
     
     private static final Gson gson = new Gson();
 
-    private static final String SYS_DVCD = "OPA";
+    private static final String SYS_DVCD = "API";		//시스템코드
+    private static final String BZWK_DVCD = "99";		//업무구분코드
+    private static final String SUB_BZWK_CD = "9019";	//세부구분코드
+    
+    
     private final MonitoringPropertyService propertyService;
 
     public UmsService(MonitoringPropertyService propertyService) {
@@ -145,12 +149,14 @@ public class UmsService {
         stdHeadVO.setSys_env_dvcd(SystemUtil.getSysOperEvirnDstcd()); 	// D:개발 T:테스트 P:운영
         stdHeadVO.setTx_tycd("O");										// O:온라인 B:배치
         stdHeadVO.setSynz_dvcd("S");									// S:동기 A:비동기
-        stdHeadVO.setChnl_tycd("");										// 채널유형코드 
+        stdHeadVO.setChnl_tycd("EAI");									// 채널유형코드 
         stdHeadVO.setHmab_dvcd("1");									// 내외구분코드  1:내부 2:외부(타발)
         stdHeadVO.setIf_id(messageRequest.getEaiInterfaceId());			// 인터페이스ID
         stdHeadVO.setTx_id(messageRequest.getServiceId());				// 거래ID
         
         if ("MESSENGER".equals(messageRequest.getMessageType()) ) {
+
+            stdHeadVO.setChnl_tycd("FEP");								// 채널유형코드 
             
             // 스윙챗 알림 공용
         	SwingCommonVO swiComVO = new SwingCommonVO();
@@ -168,7 +174,10 @@ public class UmsService {
         	// 스윙챗 알림 데이터
         	List<SwingReceiverDataVO> swiReDataVOList = new ArrayList<SwingReceiverDataVO>();
         	SwingReceiverDataVO receiver = new SwingReceiverDataVO();
+        	receiver.setType("");
+        	receiver.setCompanyCode("CB");
         	receiver.setCode(messageRequest.getMessengerId());
+        	receiver.setPrdNm("");
         	swiReDataVOList.add(receiver);
         	
         	swiDataVO.setReceiverInfo(swiReDataVOList);
@@ -209,8 +218,8 @@ public class UmsService {
             	dataVO.setAlmtk_err_ltrs_snd_yn("Y"); 						// 오류자문자발송여부
             	dataVO.setAlmtk_btn_trnm_tycd("2"); 						// 카카오버튼전송방식  1-format string   2-JSON  3-XML
             }
-            dataVO.setSms_trnm_bzwk_dvcd(""); 								//업무구분코드
+            dataVO.setSms_trnm_bzwk_dvcd(BZWK_DVCD); 						//업무구분코드
-            dataVO.setSms_bzwk_dcls_dvcd("");  								//업무세분코드
+            dataVO.setSms_bzwk_dcls_dvcd(SUB_BZWK_CD);  					//업무세분코드
             dataVO.setSms_sys_dvcd("83"); 									//시스템코드
             dataVO.setTx_dt(jsonData[0]); 									//거래일자
             dataVO.setTx_tktm(jsonData[1].substring(0,6)); 					//거래시간
@@ -248,8 +257,8 @@ public class UmsService {
             dataVO.setTmplt_mpng_rptt_info(""); 							// 탬플릿매핑반복정보
             dataVO.setSnd_empno(""); 										// 발신자ID(필수)
             dataVO.setSnd_emp_dprm_cd(""); 									// 발신자부서코드(필수)
-            dataVO.setBzwk_cd(""); 											// 업무구분코드
+            dataVO.setBzwk_cd(BZWK_DVCD); 									// 업무구분코드
-            dataVO.setSub_bzwk_cd(""); 										// 업무세부코드
+            dataVO.setSub_bzwk_cd(SUB_BZWK_CD); 							// 업무세부코드
             dataVO.setSys_dvcd(SYS_DVCD); 									
             dataVO.setTx_dt(jsonData[0]); 									//거래일자
             dataVO.setTx_tktm(jsonData[1].substring(0,6)); 					//거래시간
@@ -277,58 +286,41 @@ public class UmsService {
     private String[] makeStdGuidInfo() {
     	// 리턴값
     	String rtnVal[] = new String[3];
-    	
     	// 현재시간
     	Date currentDate = new Date();
-    	
     	SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
     	String formattedDate = sdf.format(currentDate);
-    	
     	rtnVal[0] = formattedDate.substring(0,8);
     	rtnVal[1] = formattedDate.substring(8);
-    	
     	// 랜던값
     	String random20 = this.genrateRandomStringNumber20();
-    	
     	rtnVal[2] = formattedDate  + SYS_DVCD + random20;
-    	
     	return rtnVal;
     }
     
     
     private String genrateRandomStringNumber20() {
 	    String rtnVal= "";
-	    
 	    StringBuilder buffer= new StringBuilder(10);
-	    
 	    // 랜덤값
 	    String characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-	    
 	    // 랜덤객체 생성
 	    SecureRandom random = new SecureRandom();
-	    
 	    // 반복문
 	    for (int i= 0;i< 10;i++) {
 	    	// 랜덤수
 	    	int randomIndex = random.nextInt(characters.length());
-	    	
 	    	// 생성된 랜덤값
 	    	char randomChar = characters.charAt(randomIndex);
-	    
 	    	// 랜덤값 저장
 	    	buffer.append(randomChar);
 	    }
-	    	
     	// 랜덤객체 재생성
     	random = new SecureRandom();
-    	
 	    // 난수 10개 생성
 	    int random10 = (int) (Math.pow(10, 9) + random.nextDouble() * Math.pow(10, 9));
-	    
 	    // 문자 숫자 조합(10) + 숫자(10)
 	    rtnVal = buffer.toString() + Integer.toString(random10);
-	    
-	    //리턴
 	    return rtnVal;
 	}
     

src/main/java/com/eactive/eai/rms/ext/kjb/smsauth/SmsAuthService.java

@@ -137,8 +137,9 @@ public class SmsAuthService {
             
             HashMap<String,Object> params = new HashMap<String, Object>();
             params.put("authNumber", authCode);
+            params.put("userName", userInfo.getUsername());
             
-            ums.send(userInfo, MessageCode.USER_VERIFICATION_MOBILEPHONE, params);
+            ums.send(userInfo, MessageCode.ADMIN_VERIFICATION_MOBILEPHONE, params);
             return true;
         } catch (Exception e) {
             log.error("SMS 인증번호 발송 실패", e);