-
-
-
-
diff --git a/WebContent/jsp/onl/admin/rule/layoutManDetail.jsp b/WebContent/jsp/onl/admin/rule/layoutManDetail.jsp
index 9fb1e00..5a6de0c 100644
--- a/WebContent/jsp/onl/admin/rule/layoutManDetail.jsp
+++ b/WebContent/jsp/onl/admin/rule/layoutManDetail.jsp
@@ -71,7 +71,7 @@
$('#grid').children().remove();
- const itemTypes = ['Field', 'Grid', 'Group', 'Attr'];
+ const itemTypes = ['Field', 'Grid', 'Group', 'Attr', 'Array'];
columns = [ // for columnData prop
{ title: '<%= localeMessage.getString("layoutMan.itmeEn") %>', name: 'loutItemName', type: 'text', width:280, resize:true, minWidth:120 },
diff --git a/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp b/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp
index 08e7907..8fb0a7a 100644
--- a/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp
+++ b/WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp
@@ -54,6 +54,7 @@
const LAYOUT_ITEM_TYPE_GROUP = "Group";
const LAYOUT_ITEM_TYPE_GRID = "Grid";
const LAYOUT_ITEM_TYPE_FIELD = "Field";
+ const LAYOUT_ITEM_TYPE_ARRAY = "Array";
var isDetail = false;
@@ -550,6 +551,14 @@
return data;
}
+ // 항목 자신이 Array인 경우, 경로/변환명령 끝에 반복 표시 [*]를 추가
+ function addArrayTag(loutItemType, data) {
+ if (loutItemType == LAYOUT_ITEM_TYPE_ARRAY && !data.endsWith("[*]")) {
+ data = data + "[*]";
+ }
+ return data;
+ }
+
//변환명에 있는 서비스코드와 if서비스 코드 매칭
function validation(){
if ($('input[name=cnvsnName]').val() == '') {
@@ -889,10 +898,10 @@
let selectValue = "";
let targetValue = "";
for ( var i = 0; i < sourceData.length; i++) {
- if (sourceData[i]['loutItemType'] != "Field" && sourceData[i]['loutItemType'] != "Attr") continue;
+ if (sourceData[i]['loutItemType'] != "Field" && sourceData[i]['loutItemType'] != "Attr" && sourceData[i]['loutItemType'] != "Array") continue;
selectValue = (sourceData[i]['LOUTITEMPATH']).substr(sourceData[i]['loutName'].length+1);
for (var j = 0; j
');
@@ -936,15 +945,15 @@
var targetValue = "";
var j=tgtIndex-1-1;
for ( var i = srcIndex-1; i < sourceData.length; i++) {
- if (sourceData[i]['loutItemType'] != LAYOUT_ITEM_TYPE_FIELD) continue;
+ if (sourceData[i]['loutItemType'] != LAYOUT_ITEM_TYPE_FIELD && sourceData[i]['loutItemType'] != LAYOUT_ITEM_TYPE_ARRAY) continue;
j++;
- while (targetData.length -1 >= j &&targetData[j]["loutItemType"] != LAYOUT_ITEM_TYPE_FIELD){
+ while (targetData.length -1 >= j && targetData[j]["loutItemType"] != LAYOUT_ITEM_TYPE_FIELD && targetData[j]["loutItemType"] != LAYOUT_ITEM_TYPE_ARRAY){
j++;
}
if (targetData.length -1 < j) break;
var targetRowId = targetData[j]['id'];
- targetGrid.jqGrid('setCell',targetRowId,'CNVSNCMDNAME',addGroupTag(srcGroup,sourceData[i]['LOUTITEMPATH']));
- targetGrid.jqGrid('setCell',targetRowId,'CNVSNRSULTITEMPATHNAME',addGroupTag(tgtGroup,targetData[j]['LOUTITEMPATH']));
+ targetGrid.jqGrid('setCell',targetRowId,'CNVSNCMDNAME',addArrayTag(sourceData[i]['loutItemType'], addGroupTag(srcGroup,sourceData[i]['LOUTITEMPATH'])));
+ targetGrid.jqGrid('setCell',targetRowId,'CNVSNRSULTITEMPATHNAME',addArrayTag(targetData[j]['loutItemType'], addGroupTag(tgtGroup,targetData[j]['LOUTITEMPATH'])));
targetGrid.jqGrid('setCell',targetRowId,'CNVSNITEMSERNO',targetData[j]['loutItemSerno']);
const sourceEndpointElementId = sourceGrid.getEndpointElementId(sourceData[i]['id']);
@@ -1015,7 +1024,7 @@
var targetData = targetGrid.getRowData();
var gridData = new Array();
for (var i = 0; i ";
}else{
return "";
@@ -1170,7 +1179,7 @@
function tgtformatterFunction(cellvalue,options,rowObject){
var rowId = options["rowId"];
var loutItemType = rowObject["loutItemType"];
- if (loutItemType == 'Field' || loutItemType == 'Attr'){
+ if (loutItemType == 'Field' || loutItemType == 'Attr' || loutItemType == 'Array'){
return "";
@@ -1669,8 +1678,8 @@
return;
}
- if ((sourceRow["loutItemType"] != 'Field' && sourceRow["loutItemType"] != 'Attr')
- || (targetRow["loutItemType"] != 'Field' && targetRow["loutItemType"] != 'Attr')) {
+ if ((sourceRow["loutItemType"] != 'Field' && sourceRow["loutItemType"] != 'Attr' && sourceRow["loutItemType"] != 'Array')
+ || (targetRow["loutItemType"] != 'Field' && targetRow["loutItemType"] != 'Attr' && targetRow["loutItemType"] != 'Array')) {
alert('<%=localeMessage.getString("transformManDetail.alert3")%>');
return ;
}
@@ -1684,7 +1693,7 @@
if (targetRow['CNVSNCMDNAME'] == '') {
// 변환 명령 값이 한번 설정 되면 변경 되지 않게 함.
- var cnvsnCmdName = addGroupTag(srcGroup,sourceRow["LOUTITEMPATH"]);
+ var cnvsnCmdName = addArrayTag(sourceRow["loutItemType"], addGroupTag(srcGroup,sourceRow["LOUTITEMPATH"]));
// function까지 처리되도록 수정했으나, parameter가 하나인 경우에만 정상처리됨
if($('#functionCombo').val() != "") {
cnvsnCmdName = $('#functionCombo').val() + "(" + cnvsnCmdName + ")";
@@ -1693,7 +1702,7 @@
targetGrid.jqGrid('setCell',tgtRowId,'CNVSNCMDNAME', cnvsnCmdName);
}
- targetGrid.jqGrid('setCell',tgtRowId,'CNVSNRSULTITEMPATHNAME',addGroupTag(tgtGroup,targetRow["LOUTITEMPATH"]));
+ targetGrid.jqGrid('setCell',tgtRowId,'CNVSNRSULTITEMPATHNAME',addArrayTag(targetRow["loutItemType"], addGroupTag(tgtGroup,targetRow["LOUTITEMPATH"])));
targetGrid.jqGrid('setCell',tgtRowId,'CNVSNITEMSERNO',targetRow['loutItemSerno']);
targetGrid.jqGrid('setCell',tgtRowId,'CNVSNSRCITEMS', cnvsnSrcItems);
targetGrid.jqGrid('setCell',tgtRowId,'ISVALIDMAPPING', true);
@@ -1885,8 +1894,8 @@
if (loutItemType == LAYOUT_ITEM_TYPE_GRID || loutItemType == LAYOUT_ITEM_TYPE_GROUP) {
// group 인 경우
items = createGridGroupContextMenuItems(grid, rowId);
- } else if(loutItemType == LAYOUT_ITEM_TYPE_FIELD) {
- // field 인 경우
+ } else if(loutItemType == LAYOUT_ITEM_TYPE_FIELD || loutItemType == LAYOUT_ITEM_TYPE_ARRAY) {
+ // field, array 인 경우
items = createFieldContextMenuItems(grid, positionElement.attr('id'));
} else {
return false;
@@ -1989,7 +1998,7 @@
break;
}
- if (loutItemType == LAYOUT_ITEM_TYPE_FIELD) {
+ if (loutItemType == LAYOUT_ITEM_TYPE_FIELD || loutItemType == LAYOUT_ITEM_TYPE_ARRAY) {
loutItemPath = loutItemPath.replace(new RegExp("^" + prefix), "");
console.debug(grid.getId() + " : loutItemPath : " + loutItemPath);
rowData['GROUP_LOUTITEMPATH'] = loutItemPath;
diff --git a/WebContent/jsp/onl/apim/portalorg/portalOrgManDetail.jsp b/WebContent/jsp/onl/apim/portalorg/portalOrgManDetail.jsp
index a25e509..b4ccc1d 100644
--- a/WebContent/jsp/onl/apim/portalorg/portalOrgManDetail.jsp
+++ b/WebContent/jsp/onl/apim/portalorg/portalOrgManDetail.jsp
@@ -11,7 +11,7 @@
response.setHeader("Expires", "0");
MonitoringContext monitoringContext = (MonitoringContext)CommonUtil.getBean(request, "monitoringContext");
- String reverseProxyUrl = monitoringContext.getStringProperty("djb.reverse_proxy.url", "");
+ String reverseProxyUrl = monitoringContext.getStringProperty(MonitoringContext.RMS_WEBHOOK_REVERSE_PROXY_URL, "");
%>
<%!
public String getRequiredLabel(String label) {
diff --git a/WebContent/jsp/onl/apim/webhook/webhookSendLogMan.jsp b/WebContent/jsp/onl/apim/webhook/webhookSendLogMan.jsp
new file mode 100644
index 0000000..fba0ece
--- /dev/null
+++ b/WebContent/jsp/onl/apim/webhook/webhookSendLogMan.jsp
@@ -0,0 +1,242 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" %>
+<%@ page import="java.io.*" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
+<%@ include file="/jsp/common/include/localemessage.jsp" %>
+<%
+ response.setHeader("Pragma", "No-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ response.setHeader("Expires", "0");
+%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
웹훅 발송 로그외부로 발송된 웹훅 이력을 조회합니다.
+
+
+
+
+
+
+
+
+
+
+
웹훅 발송 로그 상세
+
+
+
+
+
+
+ | ID |
+ |
+ 기관명 |
+ |
+
+
+ | 이벤트유형 |
+ |
+ Status Code |
+ |
+
+
+ | Target URL |
+ |
+ Proxy URL |
+ |
+
+
+ | 성공여부 |
+ |
+ 재시도횟수 |
+ |
+
+
+ | 발송서버 |
+ |
+ 발송일시 |
+ |
+
+
+ | Signature |
+ |
+
+
+ | Payload |
+ |
+
+
+ | Response Body |
+ |
+
+
+ | 에러 메세지 |
+ |
+
+
+
+
조회 전용 (등록/수정/삭제 없음)
+ */
+@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> selectList(
+ @SortDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable,
+ WebhookSendLogUISearch search) {
+ Page 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> initCombo() {
+ Map 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 selectDetail(Long id) {
+ return ResponseEntity.ok(webhookSendLogManService.selectDetail(id));
+ }
+}
diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendLogUI.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendLogUI.java
new file mode 100644
index 0000000..7b9afac
--- /dev/null
+++ b/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.
+ *
+ * 목록에서는 일부 항목만 사용하고, 상세에서는 전체 항목을 사용한다.
+ * 날짜는 yyyyMMdd HH:mm:ss 형식 문자열로 제공한다.
+ */
+@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;
+}
diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendLogUISearch.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendLogUISearch.java
new file mode 100644
index 0000000..c7f4e4f
--- /dev/null
+++ b/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;
+}
diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendRequest.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendRequest.java
index 264338e..3130aff 100644
--- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendRequest.java
+++ b/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;
}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookSendLogRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookSendLogRepository.java
index 2233a9c..9780709 100644
--- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookSendLogRepository.java
+++ b/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 {
+public interface WebhookSendLogRepository extends BaseRepository {
// 오라클 CHAR(1) Y/N 기준 조회
@Query("SELECT l FROM WebhookSendLog l " +
diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookSendLogManService.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookSendLogManService.java
new file mode 100644
index 0000000..dec6936
--- /dev/null
+++ b/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) 조회 화면 서비스.
+ *
+ * 조회 전용. orgId 는 엔티티 연관관계가 아닌 단순 컬럼이므로,
+ * 기관명은 QueryDSL 로 ptl_org 를 별도 조회하여 매핑한다.
+ */
+@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 selectList(Pageable pageable, WebhookSendLogUISearch search) {
+ QWebhookSendLog log = QWebhookSendLog.webhookSendLog;
+ BooleanBuilder predicate = new BooleanBuilder();
+
+ if (StringUtils.isNotBlank(search.getSearchOrgName())) {
+ List 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 page = webhookSendLogRepository.findAll(predicate, pageable);
+
+ Map 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 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 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 findOrgNames(List logs) {
+ Set 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);
+ }
+}
diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java
index 6a2ffc1..34233c1 100644
--- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java
+++ b/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 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 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());
@@ -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 httpRequest = new HttpEntity<>(payloadJson, headers);
- ResponseEntity response = sendWithRetry(targetUrl, httpRequest, sendLog, retryCount, retryTime);
+ ResponseEntity 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 sendWithRetry(String targetUrl, HttpEntity request, WebhookSendLog sendLog, int retryCount, int retryTime) throws Exception {
+ private ResponseEntity sendWithRetry(String proxyUrl, HttpEntity 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;
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/LayoutManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/LayoutManService.java
index 599eb9d..0c4e6b2 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/LayoutManService.java
+++ b/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;
}
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/mapper/LayoutItemUIMapper.java b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/mapper/LayoutItemUIMapper.java
index 8d3b65c..8c8b863 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/mapper/LayoutItemUIMapper.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/mapper/LayoutItemUIMapper.java
@@ -71,13 +71,33 @@ public interface LayoutItemUIMapper extends GenericMapper -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 -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