Merge branch 'jenkins_with_weblogic' of ssh://192.168.240.178:18081/eapim/eapim-admin into jenkins_with_weblogic

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

@@ -1270,14 +1270,21 @@
 
             function setupCloneInterfaceModal(event) {
 				const eaiBzwkDstcd = $('#eaiBzwkDstcd').val();
+				const eaiSvcName = $('#eaiSvcName').val();
 				const eaiSvcDesc = $('#eaiSvcDesc').val();
+				const inOutType = $('#inOutType').val();
+				const sendRecvType = $('#sendRecvType').val();
 				const inboundHttpMethod = $('#inboundHttpMethod').val();
+				const inboundRestPath = $('#inboundRestPath').val();
 
 				$('#newBizCode').val(eaiBzwkDstcd).trigger('change');
+				$('#newSvcName').val(eaiSvcName);
+				$('#newInOutType').val(inOutType);
+				$('#newSendRecvType').val(sendRecvType);
 				$('#newSvcDesc').val(eaiSvcDesc);
 				$('#newInboundHttpMethod').val(inboundHttpMethod).trigger('change');
+				$('#newInboundRestPath').val(inboundRestPath);
 				                
-                $('#newSvcName').val('');
                 if($('#inboundRestPath').prop('disabled')){
                     $('#newRoutingOptionGroup').css('display','none');
                 }else{
@@ -1611,6 +1618,7 @@
                                     <option value="none" selected>NONE</option>
                                     <option value="oauth">OAUTH</option>
                                     <option value="api_key">API_KEY</option>
+                                    <option value="ca">CA</option>
                                 </select>
                             </div>
                         </div>

WebContent/jsp/onl/transaction/tracking/trackingMan.jsp

@@ -347,8 +347,8 @@
                     '<%=localeMessage.getString("tracking.keymgtmsgctnt")%>',
                     '<%=localeMessage.getString("tracking.logprcssserno_tmp")%>',
                     '<%=localeMessage.getString("tracking.telgmrecvtrancd")%>',
-                    '<%=localeMessage.getString("tracking.eaisvcname")%>',
+                    'API ID',
-                    '<%=localeMessage.getString("tracking.eaisvcdesc")%>',
+                    'API 명',
                     '<%=localeMessage.getString("tracking.eaibzwkdstcd")%>',
                     '<%=localeMessage.getString("tracking.extBizName")%>',
                     '<%=localeMessage.getString("tracking.ifDisKeyVal")%>',
@@ -598,7 +598,7 @@
             <table class="search_condition" cellspacing=0;>
                 <tbody>
                 <tr>
-                    <th style="width:12%; min-width:120px;"><%=localeMessage.getString("tracking.eaisvcname")%></th>
+                    <th style="width:12%; min-width:120px;">API ID</th>
                     <td style="width:15%;"><input type="text" name="searchEaiSvcName" value="${param.searchEaiSvcName}"></td>
                     <th style="width:13%; min-width:140px;"><%=localeMessage.getString("tracking.bzwkdstcd")%></th>
                     <td style="width:15%; min-width:160px;">

src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java

@@ -619,11 +619,13 @@ public class ApiInterfaceService extends OnlBaseService {
         				String fullPath = inboundHttpMethod + "|" + prop.getPrpty2val() + "/" + vo.getInboundRestPath();
         				vo.setApiFullPath(fullPath);
         				
+        	        	// HS04 AndEaiSvcNameNot : 업데이트일 때 자신의 fullpath 는 제외함
+        	        	standardMessageInfoQueryService.existsByApiFullPathAndEaiSvcNameNot(vo.getApiFullPath(), eaiServiceName);
+        				
         				break;
         			}
         		}
         	}
-        	
         }
         
         // HTTP 어댑터도 등록 가능하도록 수정.

src/main/java/com/eactive/eai/rms/onl/transaction/apim/StandardMessageInfoQueryServiceForApi.java

@@ -21,6 +21,15 @@ public class StandardMessageInfoQueryServiceForApi extends AbstractDataService<S
     public void deleteByEaiSvcName(String eaiSvcName){
         repository.deleteByEaisvcname(eaiSvcName);
     }
+    
+    public void existsByApiFullPathAndEaiSvcNameNot(String apiFullPath, String eaiServiceName) {
+    	
+    	boolean isExist = repository.existsByApifullpathAndEaisvcnameNot(apiFullPath, eaiServiceName);
+    	
+    	if(isExist) {
+    		throw new RuntimeException("API FUll PATH 가 중복되었습니다 : " + apiFullPath);
+    	}
+    }
 }
 
 

src/main/java/com/eactive/eai/rms/onl/transaction/apim/repository/StandardMessageInfoRepositoryForApi.java

@@ -10,4 +10,6 @@ public interface StandardMessageInfoRepositoryForApi extends BaseRepository<Stan
     Optional<StandardMessageInfo> findByEaisvcname(String eaiSvcName);
 
     void deleteByEaisvcname(String eaiSvcName);
+    
+    boolean existsByApifullpathAndEaisvcnameNot(String fullPath, String eaiServiceName);
 }