Merge remote-tracking branch 'origin/jenkins_with_weblogic' into jenkins_with_weblogic

WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp

@@ -1313,6 +1313,8 @@
 
 						$('#functionComboDialog').val($('#functionCombo').val());
 
+						setSearchable("functionComboDialog");
+
 						mouseoverEndpoint(endpoint, 'click-endpoint');
 						moveDialogPosition(false);
 					},

src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterController.java

@@ -248,7 +248,7 @@ public class AdapterController extends OnlBaseAnnotationController {
 		synchronized (obj) {
 			service.update(adapterGroupUI);
 
-			Map<String, String> resultMap = service.reloadSync(adapterGroupUI);
+			Map<String, String> resultMap = service.reloadSyncStdMsgAndAdapter(adapterGroupUI);
 			return ResponseEntity.ok(resultMap);
 		}
 

src/main/java/com/eactive/eai/rms/onl/manage/adapter/adapter/AdapterManService.java

@@ -333,8 +333,6 @@ public class AdapterManService extends OnlBaseService {
 		List<StandardMessageInfo> stdMsgInfoList = standardmessageinfoService.findByBzwksvckeynameStartingWith(adapterName);
 		
 		// 변경 사항이 있었는지 체크해서 HS04 Reload 함.
-		boolean isUpdated = false;
-
         for (StandardMessageInfo stdMsgInfo : stdMsgInfoList) {
              String fullPath = stdMsgInfo.getApifullpath(); 
 
@@ -358,8 +356,6 @@ public class AdapterManService extends OnlBaseService {
             	        	// DB에 즉시 반영 
             	        	standardmessageinfoService.saveAndFlush(stdMsgInfo);
             	        	
-            	        	isUpdated = true;
-                	        
 						} catch (Exception e) {
 							
 							log.error("StandardMessageInfo APIFULLPATH SAVE FAIL key = {}", stdMsgInfo.getBzwksvckeyname());
@@ -374,22 +370,6 @@ public class AdapterManService extends OnlBaseService {
             }
         }
         
-        if (isUpdated) {
-        	
-        	try {
-        	
-	        	Command command = new ReloadSTDMessageCommand(); 
-	        	command.setArgs("ALL");
-	        	
-	        	agentUtilService.broadcast(command);
-	        	
-	        	log.debug("API 경로 변경 감지 -> 전체 표준 전문 리로드 명령 전송 완료 (ALL)");
-        	
-        	} catch (Exception e) {
-        		log.debug("브로드캐스트 전송 실패", e);
-        	}
-        }
-        
     }
 
 	public void delete(AdapterGroupUI adapterGroupUI) {
@@ -559,7 +539,55 @@ public class AdapterManService extends OnlBaseService {
 			adapterGroup.setMoniuseyn(adapterGroupUI.getMoniuseyn());
 		}
 	}
+	
+	public Map<String, String> reloadSyncStdMsgAndAdapter(AdapterGroupUI adapterGroupUI) throws Exception {
+	    Map<String, Object> receive = null;
+	    Map<String, String> result = new HashMap<>();
+	    String status = "success";
 
+	    try {
+	        log.info(">>>>>> [Reload AdapterManService Start] 리로드 시작");
+
+	        for (Entry<String, AdapterUI> entry : adapterGroupUI.getAdapterData().entrySet()) {
+	            AdapterUI adapterUI = entry.getValue();
+	            String prptyGroupName = adapterUI.getPrptygroupname();
+	            
+	            CommonCommand pcommand = new CommonCommand(
+	                    "com.eactive.eai.agent.adapter.ReloadAdapterPropGroupCommand",
+	                    prptyGroupName
+	            );
+	            agentUtilService.broadcast(pcommand);
+	        }
+
+	        // 어댑터 그룹 리로드
+	        CommonCommand acommand = new CommonCommand(
+	                "com.eactive.eai.agent.adapter.ReloadAdapterGroupCommand",
+	                adapterGroupUI.getAdptrbzwkgroupname()
+	        );
+	        receive = agentUtilService.broadcast(acommand);
+
+	        // HS04 API_FULL_PATH
+	        Command stdcommand = new ReloadSTDMessageCommand();
+	        stdcommand.setArgs("ALL");
+	        agentUtilService.broadcast(stdcommand);
+	        
+	        log.info(">>>>>> [Reload AdapterManService End] 리로드 완료");
+
+	    } catch (Exception e) {
+	        status = "error";
+	        log.error("리로드 실패", e);
+	    }
+
+	    if (receive != null && receive.values().stream().anyMatch(value -> value == null || !"success".equals(value))) {
+	        status = "error";
+	    }
+	    
+	    result.put("status", status);
+	    if(receive != null) result.put("message", receive.toString());
+	    
+	    return result;
+	}
+	
 	public Map<String, String> reloadSync(AdapterGroupUI adapterGroupUI) throws Exception {
 		Map<String, Object> receive = null;
 		Map<String, String> result = new HashMap<>();
@@ -571,19 +599,19 @@ public class AdapterManService extends OnlBaseService {
 					prptyGroupName);
 			agentUtilService.broadcast(pcommand);
 		}
-
+		
 		CommonCommand acommand = new CommonCommand("com.eactive.eai.agent.adapter.ReloadAdapterGroupCommand",
 				adapterGroupUI.getAdptrbzwkgroupname());
 		receive = agentUtilService.broadcast(acommand);
-
+		
 		if (receive.values().stream().anyMatch(value -> value == null || !"success".equals(value))) {
 			status = "error";
 		}
-
+		
 		result.put("status", status);
 		result.put("message", receive.toString());
 		return result;
-
+		
 	}
 
 	public Map<String, String> deleteSync(AdapterGroupUI map, List<AdapterUI> list) throws Exception {

src/main/java/com/eactive/eai/rms/onl/manage/control/control/ControlManController.java

@@ -17,11 +17,12 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.eactive.eai.agent.command.CommonCommand;
 import com.eactive.eai.rms.common.base.OnlBaseAnnotationController;
+import com.eactive.eai.rms.common.interceptor.InterceptorSkipController;
 import com.eactive.eai.rms.common.login.SessionManager;
 import com.google.gson.Gson;
 
 @Controller
-public class ControlManController extends OnlBaseAnnotationController  {
+public class ControlManController extends OnlBaseAnnotationController  implements InterceptorSkipController {
 
 	private static final String RELOAD_RESTRICT_INFO_COMMAND = "com.eactive.eai.agent.restrict.ReloadRestrictInfoCommand";
 	private static final String ERROR_RESULT_STATUS = "<font color='#ff0000'>에러</font>";