Merge remote-tracking branch 'origin/master'

src/main/java/com/eactive/eai/rms/common/acl/user/UserManService.java

@@ -41,6 +41,8 @@ import lombok.RequiredArgsConstructor;
 @Transactional(transactionManager = "transactionManagerForEMS")
 @RequiredArgsConstructor
 public class UserManService extends BaseService {
+	
+	
 
 	private final UserInfoService userInfoService;
 	private final UserRoleService userRoleService;
@@ -98,9 +100,11 @@ public class UserManService extends BaseService {
 
 		UserInfo userInfo = userUIMapper.toEntity(userUI);
 		userInfo.setRoleidnfiname(CommonConstants.DEPT_DEVELOPER);
+		
+		String subfix = monitoringContext.getStringProperty(MonitoringContext.RMS_PASSWORD_INIT_SUBFIX, "@!");
 
 		try {
-			userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,userUI.getUserId()));
+			userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,userUI.getUserId()+subfix));
 		} catch (Exception e) {
 			throw new RuntimeException("Error encrypting password", e);
 		}
@@ -140,8 +144,9 @@ public class UserManService extends BaseService {
 	}
 
 	public void updatePassword(UserUI userUI) throws Exception {
+		String subfix = monitoringContext.getStringProperty(MonitoringContext.RMS_PASSWORD_INIT_SUBFIX, "@!");
 		UserInfo userInfo = userInfoService.getById(userUI.getUserId());
-		userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256, userUI.getUserId()));
+		userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256, userUI.getUserId()+subfix));
 		userUIMapper.updateToEntity(userUI, userInfo);
 		userInfoService.save(userInfo);
 	}

src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java

@@ -258,9 +258,15 @@ public interface MonitoringContext {
    // 자동 로그아웃 타임아웃 (단위: 분, 기본값: 10)
    public static final String RMS_AUTO_LOGOUT_TIMEOUT = "rms.auto.logout.timeout";
 
-   // 웹훅 재전송 설정
-   public static final String API_WEBHOOK_RETRY_COUNT = "api.webhook.retry_count";
-   public static final String API_WEBHOOK_RETRY_TIME  = "api.webhook.retry_time";
+   // 웹훅 
+   public static final String RMS_WEBHOOK_REVERSE_PROXY_URL = "rms.webhook.reverse_proxy.url";
+   public static final String RMS_WEBHOOK_RETRY_COUNT = "rms.webhook.retry_count";
+   public static final String RMS_WEBHOOK_RETRY_TIME  = "rms.webhook.retry_time";
+   
+   //비밀번호 초기화 접미사
+   public static final String RMS_PASSWORD_INIT_SUBFIX = "rms.password.init.subfix";
+   
+   
    
    
 

src/main/java/com/eactive/eai/rms/common/login/LoginResponseDto.java

@@ -45,4 +45,9 @@ public class LoginResponseDto {
      * 에러 메시지 (로그인 실패 시)
      */
     private String errorMessage;
+    
+    /**
+     * 초기 비밀번호 변경 필요 여부
+     */
+    private boolean changePassword;
 }

src/main/java/com/eactive/eai/rms/common/login/MainController.java

@@ -191,6 +191,19 @@ public class MainController implements InterceptorSkipController {
 						.redirectUrl(redirectUrl)
 						.build();
 			}
+			
+
+			// 2.1 초기 비밀번호인 경우, 비밀번호 변경해야 함
+			String subfix = monitoringContext.getStringProperty(MonitoringContext.RMS_PASSWORD_INIT_SUBFIX, "@!");
+			if (userInfo.getPassword().equals(DamoManager.getInstance().hash(DamoManager.SHA256, userInfo.getUserid()+subfix))
+					|| userInfo.getPassword().equals(DamoManager.getInstance().hash(DamoManager.SHA256, userInfo.getUserid()))) {
+				return LoginResponseDto.builder()
+						.success(false)
+						.changePassword(true)
+						.errorMessage("비밀번호 변경후 사용가능합니다.")
+						.build();
+			}
+			
 
 			// 3. SMS 인증 필요 여부 체크
 			SmsAuthService smsAuthService = getSmsAuthService();
@@ -758,6 +771,9 @@ public class MainController implements InterceptorSkipController {
 								 String changePassword, String confirmPassword,
 								 String resetUserId, String resetPassword) {
 		HttpSession session = request.getSession();
+		// AJAX 로그인 인증 후 초기비밀번호 변경 경로에서 세션에 부분 로그인 상태가 남아
+		// root emergency.jsp가 main.do로 잘못 리다이렉트하는 것을 방지
+		session.removeAttribute(CommonConstants.LOGIN);
 
 		try {
 
@@ -815,6 +831,8 @@ public class MainController implements InterceptorSkipController {
 					.getString("login.pwdchanged"));
 			session.setAttribute(RESULT_MSG, localeMessage
 					.getString("login.pwdchanged"));
+			logger.debug("\n\n\n\n===================" + localeMessage
+					.getString("login.pwdchanged"));
 			return REDIRECT_LOGIN_URL;
 
 		} catch (Exception e) {

src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookSendLog.java

@@ -26,9 +26,12 @@ public class WebhookSendLog {
     )
     private Long id;
 
-    @Column(name = "TARGET_URL", nullable = false, length = 500)
+    @Column(name = "TARGET_URL", length = 500)
     private String targetUrl;
 
+    @Column(name = "PROXY_URL", length = 500)
+    private String proxyUrl;
+
     @Column(name = "EVENT_TYPE", length = 100)
     private String eventType;
 
@@ -66,6 +69,9 @@ public class WebhookSendLog {
     @Column(name = "SENT_AT")
     private LocalDateTime sentAt;
 
+    @Column(name = "SEND_BY", length = 100)
+    private String sendBy;
+
     /* Boolean 편의 메서드 */
     public void setSuccess(Boolean success) {
         this.success = (success != null && success) ? "Y" : "N";

src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogRepositoryImpl.java

@@ -126,6 +126,15 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 			query.where(qeaiLog.eaisvcname.containsIgnoreCase(eaiLogSearch.getSearchEaiSvcName()));
 		}
 
+		if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcDesc())) {
+			QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
+			JPAQuery<String> subQuery = new JPAQueryFactory(em)
+					.select(qeaiMessageEntity.eaisvcname)
+					.from(qeaiMessageEntity)
+					.where(qeaiMessageEntity.eaisvcdesc.containsIgnoreCase(eaiLogSearch.getSearchEaiSvcDesc()));
+			query.where(qeaiLog.eaisvcname.in(subQuery));
+		}
+
 		if (StringUtils.isNotBlank(eaiLogSearch.getSearchKeyMgtMsgCtnt())) {
 			query.where(qeaiLog.keymgtmsgctnt.contains(eaiLogSearch.getSearchKeyMgtMsgCtnt()));
 		}

src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendLogManController.java

@@ -0,0 +1,65 @@
+package com.eactive.eai.rms.ext.djb.webhook.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.SortDefault;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.eactive.eai.rms.common.base.BaseAnnotationController;
+import com.eactive.eai.rms.common.combo.ComboService;
+import com.eactive.eai.rms.common.vo.GridResponse;
+import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendLogUI;
+import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendLogUISearch;
+import com.eactive.eai.rms.ext.djb.webhook.service.WebhookSendLogManService;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 웹훅 발송 로그(PTL_WEBHOOK_SEND_LOG) 조회 화면 컨트롤러.
+ *
+ * <p>조회 전용 (등록/수정/삭제 없음)</p>
+ */
+@Controller
+@RequiredArgsConstructor
+public class WebhookSendLogManController extends BaseAnnotationController {
+
+	private final WebhookSendLogManService webhookSendLogManService;
+	private final ComboService comboService;
+
+	@GetMapping(value = "/onl/apim/webhook/webhookSendLogMan.view")
+	public void view() {
+		// 목록 view
+	}
+
+	@GetMapping(value = "/onl/apim/webhook/webhookSendLogMan.view", params = "cmd=DETAIL")
+	public String detailView() {
+		return "/onl/apim/webhook/webhookSendLogManDetail";
+	}
+
+	@PostMapping(value = "/onl/apim/webhook/webhookSendLogMan.json", params = "cmd=LIST")
+	public ResponseEntity<GridResponse<WebhookSendLogUI>> selectList(
+			@SortDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable,
+			WebhookSendLogUISearch search) {
+		Page<WebhookSendLogUI> page = webhookSendLogManService.selectList(pageable, search);
+		return ResponseEntity.ok(new GridResponse<>(page));
+	}
+
+	@PostMapping(value = "/onl/apim/webhook/webhookSendLogMan.json", params = "cmd=LIST_INIT_COMBO")
+	public ResponseEntity<Map<String, Object>> initCombo() {
+		Map<String, Object> resultMap = new HashMap<>();
+		resultMap.put("eventTypeList", comboService.getMonitoringCodeSortedBySeq(WebhookSendLogManService.CODE_GROUP_EVENT_TYPE));
+		return ResponseEntity.ok(resultMap);
+	}
+
+	@PostMapping(value = "/onl/apim/webhook/webhookSendLogMan.json", params = "cmd=DETAIL")
+	public ResponseEntity<WebhookSendLogUI> selectDetail(Long id) {
+		return ResponseEntity.ok(webhookSendLogManService.selectDetail(id));
+	}
+}

src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendLogUI.java

@@ -0,0 +1,39 @@
+package com.eactive.eai.rms.ext.djb.webhook.dto;
+
+import lombok.Data;
+
+/**
+ * 웹훅 발송 로그(PTL_WEBHOOK_SEND_LOG) 화면 응답 DTO.
+ *
+ * <p>목록에서는 일부 항목만 사용하고, 상세에서는 전체 항목을 사용한다.
+ * 날짜는 yyyyMMdd HH:mm:ss 형식 문자열로 제공한다.</p>
+ */
+@Data
+public class WebhookSendLogUI {
+
+	private Long id;
+
+	private String orgId;
+	private String orgName;
+
+	private String eventType;
+	/** 모니터링 공통코드(EVENT_TYPE) 코드명. 상세 조회에서만 채워진다(목록은 화면에서 콤보로 변환). */
+	private String eventTypeName;
+	private String targetUrl;
+	private String proxyUrl;
+
+	private String payload;
+	private String signature;
+
+	private Integer statusCode;
+	private String responseBody;
+
+	private Boolean success;
+	private String sendBy;
+	private String errorMessage;
+	private Integer retryCount;
+
+	/* 등록/발송 시간 — yyyyMMdd HH:mm:ss */
+	private String createdAt;
+	private String sentAt;
+}

src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendLogUISearch.java

@@ -0,0 +1,23 @@
+package com.eactive.eai.rms.ext.djb.webhook.dto;
+
+import lombok.Data;
+
+@Data
+public class WebhookSendLogUISearch {
+
+	/* 기관명 (ptl_org.org_name, LIKE 검색) */
+	private String searchOrgName;
+
+	/* 이벤트 유형 (모니터링 공통코드 EVENT_TYPE, 콤보 선택 값과 정확히 일치) */
+	private String searchEventType;
+
+	/* 수신 URL (LIKE 검색) */
+	private String searchTargetUrl;
+
+	/* 성공여부 (Y/N, 공백=전체) */
+	private String searchSuccess;
+
+	/* 발송일시 기간 검색 (yyyyMMdd, 8자리 — userLoginHistoryMan.jsp 기간검색 스타일) */
+	private String searchStartDate;
+	private String searchEndDate;
+}

src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendRequest.java

@@ -8,7 +8,9 @@ import lombok.Setter;
 public class WebhookSendRequest {
 	private String orgId;
     private String targetUrl;
+    private String proxyUrl;
     private String eventType;
     private String secret;
+    private String reverseProxyPath;
     private Object data;
 }

src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookSendLogRepository.java

@@ -4,17 +4,17 @@ package com.eactive.eai.rms.ext.djb.webhook.repository;
 import java.time.LocalDateTime;
 import java.util.List;
 
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import com.eactive.eai.data.jpa.BaseRepository;
 import com.eactive.eai.rms.data.EMSDataSource;
 import com.eactive.eai.rms.data.entity.onl.djb.webhook.WebhookSendLog;
 
 @Repository
 @EMSDataSource
-public interface WebhookSendLogRepository extends JpaRepository<WebhookSendLog, Long> {
+public interface WebhookSendLogRepository extends BaseRepository<WebhookSendLog, Long> {
 
     // 오라클 CHAR(1) Y/N 기준 조회
     @Query("SELECT l FROM WebhookSendLog l " +

src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookSendLogManService.java

@@ -0,0 +1,174 @@
+package com.eactive.eai.rms.ext.djb.webhook.service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.eactive.apim.portal.monitoringcode.entity.MonitoringCode;
+import com.eactive.apim.portal.monitoringcode.entity.MonitoringCodeId;
+import com.eactive.apim.portal.portalorg.entity.QPortalOrg;
+import com.eactive.eai.rms.common.base.BaseService;
+import com.eactive.eai.rms.common.util.StringUtils;
+import com.eactive.eai.rms.data.entity.man.monitoringCode.repository.MonitoringCodeRepository;
+import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookSendLog;
+import com.eactive.eai.rms.data.entity.onl.djb.webhook.WebhookSendLog;
+import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendLogUI;
+import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendLogUISearch;
+import com.eactive.eai.rms.ext.djb.webhook.repository.WebhookSendLogRepository;
+import com.eactive.eai.rms.onl.common.exception.BizException;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 웹훅 발송 로그(PTL_WEBHOOK_SEND_LOG) 조회 화면 서비스.
+ *
+ * <p>조회 전용. orgId 는 엔티티 연관관계가 아닌 단순 컬럼이므로,
+ * 기관명은 QueryDSL 로 ptl_org 를 별도 조회하여 매핑한다.</p>
+ */
+@Service
+@RequiredArgsConstructor
+@Transactional(transactionManager = "transactionManagerForEMS")
+public class WebhookSendLogManService extends BaseService {
+
+	/** 모니터링 공통코드(tseairm28) 상의 웹훅 이벤트유형 코드 그룹. */
+	public static final String CODE_GROUP_EVENT_TYPE = "EVENT_TYPE";
+
+	private static final DateTimeFormatter FMT_DATETIME = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+	private static final DateTimeFormatter FMT_YYYYMMDD = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+	private final WebhookSendLogRepository webhookSendLogRepository;
+	private final MonitoringCodeRepository monitoringCodeRepository;
+
+	@PersistenceContext(unitName = "entityManagerFactoryForEMS")
+	private EntityManager entityManager;
+
+	public Page<WebhookSendLogUI> selectList(Pageable pageable, WebhookSendLogUISearch search) {
+		QWebhookSendLog log = QWebhookSendLog.webhookSendLog;
+		BooleanBuilder predicate = new BooleanBuilder();
+
+		if (StringUtils.isNotBlank(search.getSearchOrgName())) {
+			List<String> orgIds = findOrgIdsByName(search.getSearchOrgName());
+			if (orgIds.isEmpty()) {
+				// 일치하는 기관이 없으면 쿼리를 실행할 필요 없이 빈 결과를 바로 반환한다.
+				// (QueryDSL의 where false 는 이 프로젝트의 Hibernate HQL 파서에서 지원하지 않음)
+				return Page.empty(pageable);
+			}
+			predicate.and(log.orgId.in(orgIds));
+		}
+		if (StringUtils.isNotBlank(search.getSearchEventType())) {
+			predicate.and(log.eventType.eq(search.getSearchEventType()));
+		}
+		if (StringUtils.isNotBlank(search.getSearchTargetUrl())) {
+			predicate.and(log.targetUrl.containsIgnoreCase(search.getSearchTargetUrl()));
+		}
+		if (StringUtils.isNotBlank(search.getSearchSuccess())) {
+			predicate.and(log.success.eq(search.getSearchSuccess()));
+		}
+		if (StringUtils.isNotBlank(search.getSearchStartDate())) {
+			predicate.and(log.sentAt.goe(parseYYYYMMDD(search.getSearchStartDate()).atStartOfDay()));
+		}
+		if (StringUtils.isNotBlank(search.getSearchEndDate())) {
+			predicate.and(log.sentAt.loe(parseYYYYMMDD(search.getSearchEndDate()).atTime(23, 59, 59)));
+		}
+
+		Page<WebhookSendLog> page = webhookSendLogRepository.findAll(predicate, pageable);
+
+		Map<String, String> orgNameMap = findOrgNames(page.getContent());
+		// 목록의 이벤트유형 코드명은 화면에서 콤보(LIST_INIT_COMBO) 기준으로 변환하므로 서버에서는 조회하지 않는다(N+1 방지).
+		return page.map(e -> convertToUI(e, orgNameMap.get(e.getOrgId()), null));
+	}
+
+	public WebhookSendLogUI selectDetail(Long id) {
+		WebhookSendLog entity = webhookSendLogRepository.findById(id)
+				.orElseThrow(() -> new BizException("존재하지 않는 웹훅 발송 로그입니다."));
+
+		Map<String, String> orgNameMap = findOrgNames(Collections.singletonList(entity));
+		String eventTypeName = resolveEventTypeName(entity.getEventType());
+		return convertToUI(entity, orgNameMap.get(entity.getOrgId()), eventTypeName);
+	}
+
+	private static LocalDate parseYYYYMMDD(String yyyyMMdd) {
+		return LocalDate.parse(yyyyMMdd, FMT_YYYYMMDD);
+	}
+
+	/** 모니터링 공통코드(EVENT_TYPE)에서 코드명을 조회한다. 코드가 없으면 원본 코드를 그대로 반환한다. */
+	private String resolveEventTypeName(String eventType) {
+		if (StringUtils.isBlank(eventType)) {
+			return eventType;
+		}
+		return monitoringCodeRepository.findById(new MonitoringCodeId(CODE_GROUP_EVENT_TYPE, eventType))
+				.map(MonitoringCode::getCodeName)
+				.orElse(eventType);
+	}
+
+	/** 기관명 LIKE 검색으로 매칭되는 orgId 목록. */
+	private List<String> findOrgIdsByName(String orgName) {
+		QPortalOrg org = QPortalOrg.portalOrg;
+		return new JPAQueryFactory(entityManager)
+				.select(org.id)
+				.from(org)
+				.where(org.orgName.containsIgnoreCase(orgName))
+				.fetch();
+	}
+
+	/** 목록/상세에 필요한 orgId → orgName 매핑 (일괄 조회로 N+1 방지). */
+	private Map<String, String> findOrgNames(List<WebhookSendLog> logs) {
+		Set<String> orgIds = logs.stream()
+				.map(WebhookSendLog::getOrgId)
+				.filter(StringUtils::isNotBlank)
+				.collect(Collectors.toSet());
+		if (orgIds.isEmpty()) {
+			return Collections.emptyMap();
+		}
+
+		QPortalOrg org = QPortalOrg.portalOrg;
+		return new JPAQueryFactory(entityManager)
+				.select(org.id, org.orgName)
+				.from(org)
+				.where(org.id.in(orgIds))
+				.fetch()
+				.stream()
+				.collect(Collectors.toMap(t -> t.get(org.id), t -> t.get(org.orgName)));
+	}
+
+	private WebhookSendLogUI convertToUI(WebhookSendLog e, String orgName, String eventTypeName) {
+		WebhookSendLogUI ui = new WebhookSendLogUI();
+		ui.setId(e.getId());
+		ui.setOrgId(e.getOrgId());
+		ui.setOrgName(orgName);
+		ui.setEventType(e.getEventType());
+		ui.setEventTypeName(eventTypeName);
+		ui.setTargetUrl(e.getTargetUrl());
+		ui.setProxyUrl(e.getProxyUrl());
+		ui.setPayload(e.getPayload());
+		ui.setSignature(e.getSignature());
+		ui.setStatusCode(e.getStatusCode());
+		ui.setResponseBody(e.getResponseBody());
+		ui.setSuccess(e.getSuccess());
+		ui.setSendBy(e.getSendBy());
+		ui.setErrorMessage(e.getErrorMessage());
+		ui.setRetryCount(e.getRetryCount());
+		ui.setCreatedAt(fmt(e.getCreatedAt(), FMT_DATETIME));
+		ui.setSentAt(fmt(e.getSentAt(), FMT_DATETIME));
+		return ui;
+	}
+
+	private static String fmt(LocalDateTime t, DateTimeFormatter f) {
+		return t == null ? "" : t.format(f);
+	}
+}

src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java

@@ -22,7 +22,9 @@ import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestTemplate;
 
+import com.eactive.apim.portal.portalorg.entity.QPortalOrg;
 import com.eactive.eai.rms.common.context.MonitoringContext;
+import com.eactive.eai.rms.common.util.ContainerUtil;
 import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReq;
 import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReqApi;
 import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReqEvent;
@@ -60,17 +62,21 @@ public class WebhookService {
         QWebhookReq req = QWebhookReq.webhookReq;
         QWebhookReqEvent evt = QWebhookReqEvent.webhookReqEvent;
         QWebhookReqApi api = QWebhookReqApi.webhookReqApi;
+        QPortalOrg org = QPortalOrg.portalOrg;
+        
+        String reverseProxyUrl = monitoringContext.getProperty(MonitoringContext.RMS_WEBHOOK_REVERSE_PROXY_URL);
 
         List<Tuple> tuples = new JPAQueryFactory(entityManager)
-                .select(req.orgId, req.targetUrl, req.secret, api.id.apiId)
+                .select(req.orgId, req.targetUrl, req.secret, org.reverseProxyPath, api.id.apiId)
                 .from(req)
                 .join(evt).on(req.id.eq(evt.id.webhookReqId))
                 .join(api).on(req.id.eq(api.id.webhookReqId))
+                .join(org).on(req.orgId.eq(org.id))
                 .where(evt.id.eventType.eq(event)
                         .and(api.id.apiId.in(apiIds)))
                 .fetch();
 
-        // orgId + targetUrl + secret 기준으로 그룹핑, apiId를 data(List)로 집계
+        // orgId + targetUrl + secret 기준으로 그룹핑, apiIds를 data(List)로 집계
         Map<String, WebhookSendRequest> resultMap = new LinkedHashMap<>();
         for (Tuple t : tuples) {
             String key = t.get(req.orgId) + "|" + t.get(req.targetUrl);
@@ -78,6 +84,7 @@ public class WebhookService {
                 WebhookSendRequest wr = new WebhookSendRequest();
                 wr.setOrgId(t.get(req.orgId));
                 wr.setTargetUrl(t.get(req.targetUrl));
+                wr.setProxyUrl(this.getProxyUrl(reverseProxyUrl, t.get(org.reverseProxyPath), t.get(req.targetUrl)));
                 wr.setSecret(t.get(req.secret));
                 wr.setEventType(event);
                 wr.setData(new ArrayList<String>());
@@ -88,6 +95,46 @@ public class WebhookService {
 
         return new ArrayList<>(resultMap.values());
     }
+    
+    //reverse proxy 서버로 발송하기 위한 url 만든다
+    private String getProxyUrl(String proxyUrl, String path, String targetUrl) {
+    	String base = stripTrailingSlash(proxyUrl);
+    	String normalizedPath = stripSlashes(path);
+    	// scheme://host[:port] 부분만 제거하고 이후 path/query/fragment는 그대로 유지
+    	String targetPath = targetUrl.replaceFirst("^[a-zA-Z][a-zA-Z0-9+.-]*://[^/]+", "");
+
+    	StringBuilder url = new StringBuilder(base);
+    	if (!normalizedPath.isEmpty()) {
+    		url.append('/').append(normalizedPath);
+    	}
+    	url.append(targetPath);
+    	return url.toString();
+    }
+
+    private String stripTrailingSlash(String value) {
+    	if (value == null) {
+    		return "";
+    	}
+    	int end = value.length();
+    	while (end > 0 && value.charAt(end - 1) == '/') {
+    		end--;
+    	}
+    	return value.substring(0, end);
+    }
+
+    private String stripSlashes(String value) {
+    	if (value == null) {
+    		return "";
+    	}
+    	String result = value.trim();
+    	while (result.startsWith("/")) {
+    		result = result.substring(1);
+    	}
+    	while (result.endsWith("/")) {
+    		result = result.substring(0, result.length() - 1);
+    	}
+    	return result;
+    }
 
     /**
      * 웹훅 발송 메인 메서드
@@ -96,6 +143,7 @@ public class WebhookService {
     public void send(WebhookSendRequest req) {
     	
     	String targetUrl = req.getTargetUrl();
+    	String proxyUrl = req.getProxyUrl();
     	String secret = req.getSecret();
     	String eventType = req.getEventType();
     	Object data = req.getData();
@@ -103,7 +151,9 @@ public class WebhookService {
         WebhookSendLog sendLog = new WebhookSendLog();
         sendLog.setOrgId(req.getOrgId());
         sendLog.setTargetUrl(targetUrl);
+        sendLog.setProxyUrl(proxyUrl);
         sendLog.setEventType(eventType);
+        sendLog.setSendBy(ContainerUtil.getInstanceName());
 
         try {
             // 1. Payload 생성
@@ -123,11 +173,11 @@ public class WebhookService {
             headers.set("X-Webhook-Timestamp", String.valueOf(webhookPayload.getTimestamp()));
 
             // 4. 발송 (재시도 포함)
-            int retryCount = monitoringContext.getIntProperty(MonitoringContext.API_WEBHOOK_RETRY_COUNT, DEFAULT_RETRY_COUNT);
-            int retryTime  = monitoringContext.getIntProperty(MonitoringContext.API_WEBHOOK_RETRY_TIME,  DEFAULT_RETRY_TIME);
+            int retryCount = monitoringContext.getIntProperty(MonitoringContext.RMS_WEBHOOK_RETRY_COUNT, DEFAULT_RETRY_COUNT);
+            int retryTime  = monitoringContext.getIntProperty(MonitoringContext.RMS_WEBHOOK_RETRY_TIME,  DEFAULT_RETRY_TIME);
             sendLog.setSentAt(LocalDateTime.now());
             HttpEntity<String> httpRequest = new HttpEntity<>(payloadJson, headers);
-            ResponseEntity<String> response = sendWithRetry(targetUrl, httpRequest, sendLog, retryCount, retryTime);
+            ResponseEntity<String> response = sendWithRetry(proxyUrl, httpRequest, sendLog, retryCount, retryTime);
 
             // 5. 성공 로그
             sendLog.setStatusCode(response.getStatusCode().value());
@@ -135,7 +185,7 @@ public class WebhookService {
             sendLog.setSuccess(response.getStatusCode().is2xxSuccessful());
 
             log.info("[Webhook] 발송 성공 - eventType: {}, url: {}, status: {}, retryCount: {}",
-                    eventType, targetUrl, response.getStatusCode(), sendLog.getRetryCount());
+                    eventType, proxyUrl, response.getStatusCode(), sendLog.getRetryCount());
 
         } catch (HttpClientErrorException | HttpServerErrorException e) {
             sendLog.setStatusCode(e.getStatusCode().value());
@@ -143,13 +193,13 @@ public class WebhookService {
             sendLog.setSuccess(false);
             sendLog.setErrorMessage(e.getMessage());
             log.error("[Webhook] HTTP 오류 - eventType: {}, url: {}, status: {}",
-                    eventType, targetUrl, e.getStatusCode());
+                    eventType, proxyUrl, e.getStatusCode());
 
         } catch (Exception e) {
             sendLog.setSuccess(false);
             sendLog.setErrorMessage(e.getMessage());
             log.error("[Webhook] 발송 실패 - eventType: {}, url: {}, error: {}",
-                    eventType, targetUrl, e.getMessage());
+                    eventType, proxyUrl, e.getMessage());
         }
 
         sendLogRepository.save(sendLog);
@@ -161,24 +211,25 @@ public class WebhookService {
     /**
      * 재시도 포함 HTTP 발송
      * - 4xx: 클라이언트 오류이므로 즉시 throw (재시도 불필요)
-     * - 5xx / 네트워크 오류: 최대 RETRY_COUNT회까지 exponential backoff 재시도 (1s → 2s → 4s)
+     * - 5xx / 네트워크 오류: 최대 RETRY_COUNT회까지 선형 증가 backoff 재시도 (1s → 2s → 3s → 4s → 5s)
      */
-    private ResponseEntity<String> sendWithRetry(String targetUrl, HttpEntity<String> request, WebhookSendLog sendLog, int retryCount, int retryTime) throws Exception {
+    private ResponseEntity<String> sendWithRetry(String proxyUrl, HttpEntity<String> request, WebhookSendLog sendLog, int retryCount, int retryTime) throws Exception {
         Exception lastException = null;
         for (int attempt = 0; attempt <= retryCount; attempt++) {
             try {
                 if (attempt > 0) {
-                    long delayMs = retryTime * (1L << (attempt - 1));
-                    log.info("[Webhook] 재시도 {}/{} - url: {}, delay: {}ms", attempt, retryCount, targetUrl, delayMs);
-                    Thread.sleep(delayMs);
+                    long delayMs = (long) retryTime * attempt;
+                    log.info("[Webhook] 재시도 {}/{} - url: {}, delay: {}ms", attempt, retryCount, proxyUrl, delayMs);
                     sendLog.setRetryCount(attempt);
+                    Thread.sleep(delayMs);
                 }
-                return restTemplate.postForEntity(targetUrl, request, String.class);
+                return restTemplate.postForEntity(proxyUrl, request, String.class);
             } catch (HttpClientErrorException e) {
-                throw e; // 4xx는 재시도 불필요
+                //throw e; // 4xx는 재시도 불필요
+            	lastException = e; 	//TODO: 재시도 테스트 
             } catch (Exception e) {
                 lastException = e;
-                log.warn("[Webhook] 발송 실패 (attempt {}/{}) - url: {}, error: {}", attempt, retryCount, targetUrl, e.getMessage());
+                log.warn("[Webhook] 발송 실패 (attempt {}/{}) - url: {}, error: {}", attempt, retryCount, proxyUrl, e.getMessage());
             }
         }
         throw lastException;

src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/LayoutManService.java

@@ -352,7 +352,7 @@ public class LayoutManService extends OnlBaseService {
 		}
 
 		if (max == 0 && min == 0) {
-			if ("GRID".equalsIgnoreCase(loutItemType)) {
+			if ("GRID".equalsIgnoreCase(loutItemType) || "ARRAY".equalsIgnoreCase(loutItemType)) {
 				min = 1;
 				max = -1;
 			} else {
@@ -371,7 +371,8 @@ public class LayoutManService extends OnlBaseService {
 	}
 
 	private String determineOccurNoItem(LayoutItemUI layoutItemUI, String loutItemType) {
-		if ("GRID".equalsIgnoreCase(loutItemType) && NumberUtils.toInt(layoutItemUI.getLoutItemOccCnt()) == 0) {
+		if (("GRID".equalsIgnoreCase(loutItemType) || "ARRAY".equalsIgnoreCase(loutItemType))
+				&& NumberUtils.toInt(layoutItemUI.getLoutItemOccCnt()) == 0) {
 			return "*";
 		}
 		return String.valueOf(layoutItemUI.getLoutItemOccCnt());
@@ -385,6 +386,8 @@ public class LayoutManService extends OnlBaseService {
 			node = Item.NODE_GROUP;
 		} else if ("ATTR".equalsIgnoreCase(el.getLoutItemType())) {
 			node = Item.NODE_ATTR;
+		} else if ("ARRAY".equalsIgnoreCase(el.getLoutItemType())) {
+			node = Item.NODE_FIELD;
 		} else {
 			node = Item.NODE_FIELD;
 		}

src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/mapper/LayoutItemUIMapper.java

@@ -71,13 +71,33 @@ public interface LayoutItemUIMapper extends GenericMapper<LayoutItemUI, LayoutIt
 			itemType = isGridCondition ? "GRID" : "GROUP";
 
 			// isGridCondition이 참이고, 참조 정보2가 비어 있는 경우, itemLoopCount 설정
-			if (isGridCondition && StringUtils.isBlank(item.getLoutitemrefinfo2())
-					&& NumberUtils.isCreatable(item.getLoutitemoccurptrndstcd())
-					&& Integer.parseInt(item.getLoutitemoccurptrndstcd()) > -1 ) {
-				itemLoopCount = item.getLoutitemoccurptrndstcd();
+			if (isGridCondition && StringUtils.isBlank(item.getLoutitemrefinfo2())) {
+				if ("*".equals(item.getLoutitemoccurptrndstcd())) {
+					// 반복횟수로 '*'(무제한)이 저장된 경우, 화면 그리드에도 '*'을 그대로 표시
+					itemLoopCount = "*";
+				} else if (NumberUtils.isCreatable(item.getLoutitemoccurptrndstcd())
+						&& Integer.parseInt(item.getLoutitemoccurptrndstcd()) > -1) {
+					itemLoopCount = item.getLoutitemoccurptrndstcd();
+				}
+			}
+		} else if (ItemNodeType.FIELD.getNumber() == item.getLoutitemnodeptrnidname()) {
+			// 아이템 발생 포인터 명이 '*'이거나 숫자로 생성 가능한 경우
+			boolean isArrayCondition = "*".equals(item.getLoutitemoccurptrndstcd()) || NumberUtils.isCreatable(item.getLoutitemoccurptrndstcd());
+			// itemType을 ARRAY 또는 FIELD 로 설정
+			itemType = isArrayCondition ? "ARRAY" : "FIELD";
+
+			// isArrayCondition이 참이고, 참조 정보2가 비어 있는 경우, itemLoopCount 설정
+			if (isArrayCondition && StringUtils.isBlank(item.getLoutitemrefinfo2())) {
+				if ("*".equals(item.getLoutitemoccurptrndstcd())) {
+					// 반복횟수로 '*'(무제한)이 저장된 경우, 화면 그리드에도 '*'을 그대로 표시
+					itemLoopCount = "*";
+				} else if (NumberUtils.isCreatable(item.getLoutitemoccurptrndstcd())
+						&& Integer.parseInt(item.getLoutitemoccurptrndstcd()) > -1) {
+					itemLoopCount = item.getLoutitemoccurptrndstcd();
+				}
 			}
 		} else {
-			// 아이템 노드 타입이 GROUP이 아닌 경우, 해당 노드 타입으로 itemType 설정
+			// 아이템 노드 타입이 GROUP/FIELD가 아닌 경우, 해당 노드 타입으로 itemType 설정
 			itemType = ItemNodeType.fromNumber(item.getLoutitemnodeptrnidname()).toString();
 		}
 
@@ -85,7 +105,7 @@ public interface LayoutItemUIMapper extends GenericMapper<LayoutItemUI, LayoutIt
 
 		itemUi.setLoutItemType(itemType);
 
-		if(NumberUtils.toInt(itemLoopCount) == 0){
+		if (!"*".equals(itemLoopCount) && NumberUtils.toInt(itemLoopCount) == 0) {
 			itemLoopCount = "";
 		}
 		itemUi.setLoutItemOccCnt(itemLoopCount);

src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/mapper/LayoutPopupUIMapper.java

@@ -71,10 +71,30 @@ public interface LayoutPopupUIMapper extends GenericMapper<LayoutPopupUI, Layout
 			itemType = isGridCondition ? "GRID" : "GROUP";
 
 			// isGridCondition이 참이고, 참조 정보2가 비어 있는 경우, itemLoopCount 설정
-			if (isGridCondition && StringUtils.isBlank(item.getLoutitemrefinfo2())
-					&& NumberUtils.isCreatable(item.getLoutitemoccurptrndstcd())
-					&& Integer.parseInt(item.getLoutitemoccurptrndstcd()) > -1 ) {
-				itemLoopCount = item.getLoutitemoccurptrndstcd();
+			if (isGridCondition && StringUtils.isBlank(item.getLoutitemrefinfo2())) {
+				if ("*".equals(item.getLoutitemoccurptrndstcd())) {
+					// 반복횟수로 '*'(무제한)이 저장된 경우, 화면 그리드에도 '*'을 그대로 표시
+					itemLoopCount = "*";
+				} else if (NumberUtils.isCreatable(item.getLoutitemoccurptrndstcd())
+						&& Integer.parseInt(item.getLoutitemoccurptrndstcd()) > -1) {
+					itemLoopCount = item.getLoutitemoccurptrndstcd();
+				}
+			}
+		} else if (ItemNodeType.FIELD.getNumber() == item.getLoutitemnodeptrnidname()) {
+			// 아이템 발생 포인터 명이 '*'이거나 숫자로 생성 가능한 경우
+			boolean isArrayCondition = "*".equals(item.getLoutitemoccurptrndstcd()) || NumberUtils.isCreatable(item.getLoutitemoccurptrndstcd());
+			// itemType을 ARRAY 또는 FIELD 로 설정
+			itemType = isArrayCondition ? "ARRAY" : "FIELD";
+
+			// isArrayCondition이 참이고, 참조 정보2가 비어 있는 경우, itemLoopCount 설정
+			if (isArrayCondition && StringUtils.isBlank(item.getLoutitemrefinfo2())) {
+				if ("*".equals(item.getLoutitemoccurptrndstcd())) {
+					// 반복횟수로 '*'(무제한)이 저장된 경우, 화면 그리드에도 '*'을 그대로 표시
+					itemLoopCount = "*";
+				} else if (NumberUtils.isCreatable(item.getLoutitemoccurptrndstcd())
+						&& Integer.parseInt(item.getLoutitemoccurptrndstcd()) > -1) {
+					itemLoopCount = item.getLoutitemoccurptrndstcd();
+				}
 			}
 		} else {
 			// 아이템 노드 타입이 GROUP이 아닌 경우, 해당 노드 타입으로 itemType 설정
@@ -85,7 +105,7 @@ public interface LayoutPopupUIMapper extends GenericMapper<LayoutPopupUI, Layout
 
 		popupUI.setLoutItemType(itemType);
 
-		if(NumberUtils.toInt(itemLoopCount) == 0){
+		if (!"*".equals(itemLoopCount) && NumberUtils.toInt(itemLoopCount) == 0) {
 			itemLoopCount = "";
 		}
 		popupUI.setLoutItemOccCnt(itemLoopCount);

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

@@ -555,7 +555,7 @@ public class ApiInterfaceService extends OnlBaseService {
             restOption.setStandardCommonFields(standardCommonFields);
             return objectMapper.writeValueAsString(restOption);
         } catch (Exception e) {
-            throw new RuntimeException("Failed to create standard common option", e);
+            throw new RuntimeException("표준전문 공통부 생성을 실패했습니다", e);
         }
     }