Merge remote-tracking branch 'origin/master'

src/main/java/com/eactive/eai/rms/common/scheduler/ClusteredSchedulerConfig.java

@@ -19,23 +19,7 @@ public class ClusteredSchedulerConfig {
    
    @Autowired @Qualifier("MONITORING")
    private DataSourceType monitoringDatasource;
-   
-   /*
-   public class AutowiringSpringBeanJobFactory extends SpringBeanJobFactory {
-      @Override
-      protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
-         Object job = super.createJobInstance(bundle);
-         applicationContext.getAutowireCapableBeanFactory().autowireBean(job);
-         return job;
-      }
-   }
-   
-   @Bean
-   public SpringBeanJobFactory springBeanJobFactory() {
-      return new AutowiringSpringBeanJobFactory();
-   }
-   */
-   
+
    @Bean(name = "clusteredScheduler")
    public SchedulerFactoryBean clusteredScheduler() {
       
@@ -81,11 +65,15 @@ public class ClusteredSchedulerConfig {
       factory.setQuartzProperties(quartzProperties);
       factory.setAutoStartup(true);
       factory.setSchedulerName("EMS_ClusteredScheduler");
-//      factory.setJobFactory(springBeanJobFactory());
-      
+
+      AutoWiringSpringBeanJobFactory jobFactory =
+            new AutoWiringSpringBeanJobFactory(applicationContext.getAutowireCapableBeanFactory());
+      jobFactory.setApplicationContext(applicationContext);
+      factory.setJobFactory(jobFactory);
+
       factory.setApplicationContextSchedulerContextKey("applicationContext");
       factory.setApplicationContext(applicationContext);
-      
+
       return factory;
    }
 

src/main/java/com/eactive/eai/rms/onl/apim/messagerequest/MessageRequestManService.java

@@ -58,7 +58,11 @@ public class MessageRequestManService extends BaseService {
 		ui.setMessageType(e.getMessageType());
 
 		// 본문: 패턴 마스킹 + 색상강조 안전 HTML
-		ui.setMessageHtml(MessagePatternMaskingUtils.maskAndHighlight(e.getMessage()));
+		if (e.getMessageCode() == MessageCode.API_STATUS_CHANGED) {
+			ui.setMessageHtml(e.getMessage());
+		} else {
+			ui.setMessageHtml(MessagePatternMaskingUtils.maskAndHighlight(e.getMessage()));
+		}
 
 		// 수신자 마스킹 (email/phone 은 @Convert 로 이미 복호화된 평문)
 		ui.setUsername(MaskingUtils.maskName(e.getUsername()));

src/main/java/com/eactive/eai/rms/onl/common/service/UmsDispatchJob.java

@@ -3,6 +3,7 @@ package com.eactive.eai.rms.onl.common.service;
 import com.eactive.eai.rms.onl.common.service.ums.UmsDispatchService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -21,6 +22,7 @@ import java.util.stream.Collectors;
  */
 // Cron Expression: */5 * * * * ?
 @Slf4j
+@DisallowConcurrentExecution
 public class UmsDispatchJob implements Job {
 
 	 private final UmsDispatchService umsDispatchService;