djb-eapim/eapim-admin
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'jenkins_with_weblogic' of http://192.168.240.178:18080/eapim/eapim-admin.git into jenkins_with_weblogic

Browse Source
This commit is contained in:
cho
2026-01-08 11:09:15 +09:00
parent 9842b4d23f d20d3f0571
commit 2a04de6b11
39 changed files with 1920 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebContent/jsp/onl/admin/authserver/clientManDetail.jsp
+9 -3
View File
@@ -133,14 +133,17 @@
var selectedApiGrid = $("#selectedApiGrid");
selectedApiGrid.jqGrid({
datatype: "local",
gridview: true, // 성능 향상
rownumbers: true, // 가상 인덱스
rownumWidth: 40,
colNames: ['API ID', 'API 이름'],
colModel: [
{name: 'apiId', index: 'apiId', width: 100, align: 'center'},
{name: 'apiDesc', index: 'apiDesc', width: 100, align: 'center'}
],
rowNum: 10,
rowList: [10, 20, 30],
pager: '#selectedApiGridPager',
rowNum: -1,
// rowList: [10, 20, 30],
// pager: '#selectedApiGridPager',
sortname: 'apiId',
viewrecords: true,
sortorder: "asc",
@@ -152,6 +155,9 @@
// selectedApiGrid.jqGrid('delRowData', rowid);
}
});
selectedApiGrid.jqGrid('setLabel', 'rn', 'No'); // 가상 인덱스 ColNames
$.ajax({
type: "POST",
url: url,
WebContent/jsp/onl/admin/common/propertyManDetail.jsp
+4
View File
@@ -193,6 +193,10 @@ var url_view = '<c:url value="/onl/admin/common/propertyMan.view" />';
});
});
$("#btn_delete").click(function() {
if(!confirm("삭제하시겠습니까?")){
return;
}
var postData = $('#ajaxForm').serializeArray();
postData.push({
name : "cmd",
WebContent/jsp/onl/admin/inflow/inflowControlHistoryMan.jsp
+24 -6
View File
@@ -31,6 +31,22 @@ function timeStampFormat2(cellvalue, options, rowObject){
}
function groupNameFormat(cellvalue, options, rowObject) {
if (!cellvalue) return "";
var strVal = cellvalue.toString().trim();
if (strVal.length === 36) {
// 그룹ID의 경우 GROUPNAME 으로 보여줌
var groupName = rowObject.GROUPNAME;
// 비어있다면 원래 값을 반환
return groupName ? groupName : strVal;
}
return strVal;
}
$(document).ready(function() {
$("input[name=searchStartYYYYMMDD],input[name=searchEndYYYYMMDD]").inputmask("yyyy-mm-dd",{'autoUnmask':true});
@@ -66,10 +82,11 @@ $(document).ready(function() {
'<%= localeMessage.getString("infConHstMan.eaiSvcSrlNum") %>',
'<%= localeMessage.getString("infConHstMan.instNm") %>',
'<%= localeMessage.getString("infConHstMan.eaiSvcCd") %>',
'<%= localeMessage.getString("infConHstMan.adpGrpNm") %>',
'그룹별 / <%= localeMessage.getString("infConHstMan.adpGrpNm") %>',
'<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>',
'<%= localeMessage.getString("infAdpConMan.thr") %>',
'<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %>'
'<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %>',
'그룹별'
],
colModel:[
{ name : 'EAIBZWKDSTCD' , width:'50' , align:'center' , sortable:false },
@@ -77,10 +94,11 @@ $(document).ready(function() {
{ name : 'EAISVCSERNO' , width:'150', align:'left' },
{ name : 'EAISEVRINSTNCNAME' , width:'50' , align:'center' },
{ name : 'EAISVCNAME' , width:'70' , align:'center' },
{ name : 'ADPTRBZWKGROUPNAME' , width:'70' , align:'center' },
{ name : 'THRESHOLDPERSECOND' , width:'40' , align:'right' },
{ name : 'THRESHOLD' , width:'40' , align:'right' },
{ name : 'THRESHOLDTIMEUNIT' , width:'70' , align:'center' }
{ name : 'ADPTRBZWKGROUPNAME' , width:'100' , align:'center' , formatter: groupNameFormat },
{ name : 'THRESHOLDPERSECOND' , width:'30' , align:'right' },
{ name : 'THRESHOLD' , width:'30' , align:'right' },
{ name : 'THRESHOLDTIMEUNIT' , width:'50' , align:'center' },
{ name : 'GROUPNAME' , width:'70' , hidden:true }
],
jsonReader: {
repeatitems:false
WebContent/jsp/onl/admin/rule/layoutMan.jsp
+4
View File
@@ -313,6 +313,10 @@
$('#btn_import').click(onclickExcelImport);
$("#btn_delete").click(function () {
if(!confirm("삭제하시겠습니까?")){
return;
}
var id = "grid";
var delArr = new Array();
var ids = $("#grid").jqGrid('getDataIDs');
WebContent/jsp/onl/admin/rule/transform2/transform2Man.jsp
+4
View File
@@ -238,6 +238,10 @@ $(document).ready(function() {
$('#btn_clone').click(onclickBtnClone);
$("#btn_delete").click(function(){
if(!confirm("삭제하시겠습니까?")){
return;
}
var id = "grid";
var cnvsnNameArr = new Array();
var eaiSvcNameArr = new Array();
WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp
+14 -2
View File
@@ -703,7 +703,15 @@
transformRows = json.transformRows;
//eaiSvcName combo
$("input[name=eaiSvcName]").val('${param.eaiSvcName }');
$("input[name=eaiSvcDesc]").val('${param.eaiSvcDesc }');
var rawDesc = '${param.eaiSvcDesc}';
if (rawDesc && rawDesc !== "") {
$("input[name=eaiSvcDesc]").val(decodeURIComponent(rawDesc));
} else {
$("input[name=eaiSvcDesc]").val("");
}
//$("input[name=cnvsnDesc]").val('${param.cnvsnDesc }');
new makeOptions("CODE","NAME").setObj($("#functionCombo")).setData(json.functionRows).setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("transformManDetail.none")%>").setFormat(codeName3OptionFormat).rendering();
@@ -1065,6 +1073,10 @@
});
$("#btn_delete").click(function(){
if(!confirm("삭제하시겠습니까?")){
return;
}
var postData = [];
const cnvsnName = $("select[name=transformForEaiSvcNameCombo]").val();
const cnvsnType = cnvsnName.slice(-3);
@@ -1606,7 +1618,7 @@
// 연결이 존재 하는 지 확인
if (jsPlumbInstance.getConnections({source:sourceEndpointElementId, target:targetEndpointElementId}).length > 0) {
alert('<%=localeMessage.getString("transformManDetail.alert10")%>');
<%-- alert('<%=localeMessage.getString("transformManDetail.alert10")%>'); --%>
return;
}
WebContent/jsp/onl/admin/service/jmsQueueManDetail.jsp
+4
View File
@@ -154,6 +154,10 @@ $(document).ready(function() {
});
});
$("#btn_delete").click(function(){
if(!confirm("삭제하시겠습니까?")){
return;
}
var disabled = $('#ajaxForm').find(':input:disabled').removeAttr('disabled');
var postData = $('#ajaxForm').serializeArray();
disabled.attr('disabled','disabled');
WebContent/jsp/onl/apim/portalterms/portalTermsManDetail.jsp
+123 -11
View File
@@ -19,12 +19,45 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<jsp:include page="/jsp/common/include/css.jsp"/>
<link rel="stylesheet" type="text/css" href="<c:url value="/css/editor-content.css"/>"/>
<style>
.file-link {
color: #0049b4;
text-decoration: none;
}
.file-link:hover {
text-decoration: underline;
}
.file-size {
color: #888;
font-size: 12px;
}
.btn-file-delete {
background: none;
border: none;
cursor: pointer;
color: #dc3545;
padding: 2px 4px;
margin-left: 8px;
vertical-align: middle;
}
.btn-file-delete:hover {
color: #a71d2a;
}
.btn-file-delete .material-icons {
font-size: 16px;
vertical-align: middle;
}
</style>
<jsp:include page="/jsp/common/include/script.jsp"/>
<jsp:include page="/jsp/common/include/portal.jsp"/>
<script language="javascript">
var url = '<c:url value="/onl/apim/portalterms/portalTermsMan.json" />';
var url_view = '<c:url value="/onl/apim/portalterms/portalTermsMan.view" />';
var imageUploadUrl = '<c:url value="/onl/apim/editor/image/upload.json" />';
var imageViewUrl = '<c:url value="/onl/apim/editor/image/view.do" />';
var fileDownloadUrl = '<c:url value="/file/download.do" />';
var isDetail = false;
var currentAttachedFileId = null;
function decodeHTMLEntities(text) {
var textArea = document.createElement('textarea');
@@ -32,6 +65,42 @@
return textArea.value;
}
function formatFileSize(bytes) {
if (!bytes || bytes === 0) return '0 B';
var k = 1024;
var sizes = ['B', 'KB', 'MB', 'GB'];
var i = Math.floor(Math.log(bytes) / Math.log(k));
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
}
function showAttachedFile(fileId, fileName, fileSize) {
var downloadLink = fileDownloadUrl + '?fileId=' + fileId + '&fileSn=1';
var html = '<a href="' + downloadLink + '" class="file-link" title="다운로드">' +
'<i class="material-icons" style="vertical-align: middle; font-size: 18px;">attach_file</i> ' +
fileName + '</a>';
if (fileSize) {
html += ' <span class="file-size">(' + formatFileSize(fileSize) + ')</span>';
}
html += ' <button type="button" class="btn-file-delete" onclick="deleteAttachedFile()" title="삭제">' +
'<i class="material-icons">close</i></button>';
$('#attachedFileInfo').html(html).show();
$('#attachedFileInput').hide();
}
function hideAttachedFile() {
$('#attachedFileInfo').html('').hide();
$('#attachedFileInput').show();
$('#attachedFile').val('');
}
function deleteAttachedFile() {
if (confirm('첨부파일을 삭제하시겠습니까?')) {
currentAttachedFileId = null;
$('#deleteAttachment').val('true');
hideAttachedFile();
}
}
function init() {
$.ajax({
type: "POST",
@@ -73,7 +142,9 @@
$("#status").val(data.status);
var decodedContent = decodeHTMLEntities(data.contents);
$('#contents').summernote('code', decodedContent);
// 플레이스홀더를 이미지 태그로 변환하여 에디터에 표시
var htmlContent = convertPlaceholdersToImages(decodedContent, imageViewUrl);
$('#contents').summernote('code', htmlContent);
if (data.publishedOn) {
$("#publishedOnDisplay").val(gridDateFormat(data.publishedOn));
@@ -86,6 +157,14 @@
$("#createdDate").text(timeStampFormat(data.createdDate));
$("#lastModifiedDate").text(timeStampFormat(data.lastModifiedDate));
$("#lastModifiedByName").text(data.lastModifiedByName);
// 첨부파일 정보 표시
currentAttachedFileId = data.attachedFileId;
if (data.attachedFileId && data.attachedFileName) {
showAttachedFile(data.attachedFileId, data.attachedFileName, data.attachedFileSize);
} else {
hideAttachedFile();
}
},
error: function (e) {
alert(e.responseText);
@@ -127,10 +206,13 @@
}
});
// Summernote 에디터 초기화 (이미지 붙여넣기 data-uri 방식, 리사이징 지원)
// Summernote 에디터 초기화 (파일 업로드 방식, 리사이징 지원)
initSummernote('#contents', {
placeholder: '여기에 약관 내용을 입력하세요.',
height: 300
height: 300,
useFileUpload: true,
uploadUrl: imageUploadUrl,
imageViewUrl: imageViewUrl
});
if (agreementsType && revision) {
@@ -152,24 +234,43 @@
return;
$("#agreementsType").prop('disabled', false);
var postData = $('#ajaxForm').serializeArray();
if (isDetail) {
postData.push({ name: "cmd", value: "UPDATE" });
} else {
postData.push({ name: "cmd", value: "INSERT" });
// 이미지 태그를 플레이스홀더로 변환 (저장 시)
var contentsWithPlaceholders = convertImagesToPlaceholders(contents);
// 현재 사용 중인 파일 ID 목록 추출
var usedFileIds = extractFileIdsFromContent(contentsWithPlaceholders);
// FormData로 전송 (첨부파일 포함)
var formData = new FormData();
formData.append('cmd', isDetail ? "UPDATE" : "INSERT");
formData.append('agreementsType', $("#agreementsType").val());
formData.append('revision', $("#revisionHidden").val());
formData.append('publishedOn', $("#publishedOn").val());
formData.append('contents', contentsWithPlaceholders);
formData.append('usedFileIds', usedFileIds.join(','));
// 첨부파일 추가
var attachedFile = $('#attachedFile')[0].files[0];
if (attachedFile) {
formData.append('attachedFile', attachedFile);
}
// 첨부파일 삭제 플래그
formData.append('deleteAttachment', $('#deleteAttachment').val() || 'false');
$.ajax({
type: "POST",
url: url,
data: postData,
data: formData,
processData: false,
contentType: false,
success: function (json) {
alert("<%= localeMessage.getString("common.saveMsg") %>");
goNav(returnUrl);
},
error: function (e) {
alert(e.responseText);
var errorMsg = e.responseText || e.statusText || "저장 중 오류가 발생했습니다.";
alert(errorMsg);
}
});
});
@@ -217,8 +318,9 @@
<button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button>
</div>
<div class="title" id="title">약관</div>
<form id="ajaxForm">
<form id="ajaxForm" enctype="multipart/form-data">
<input type="hidden" name="revision" id="revisionHidden">
<input type="hidden" id="deleteAttachment" value="false">
<table class="table_row" cellspacing="0">
<tr>
<th style="width:10%;"><%= getRequiredLabel("약관명") %></th>
@@ -251,6 +353,16 @@
<input type="hidden" id="publishedOn" name="publishedOn"/>
</td>
</tr>
<tr>
<th>첨부파일</th>
<td colspan="3">
<div id="attachedFileInfo" style="display:none; padding: 5px 0;"></div>
<div id="attachedFileInput">
<input type="file" id="attachedFile" name="attachedFile" style="width:400px;">
<span class="file-help" style="color:#666; font-size:12px; margin-left:10px;">약관 원본 문서를 첨부할 수 있습니다.</span>
</div>
</td>
</tr>
<tr>
<th><%= getRequiredLabel("약관 내용") %></th>
<td colspan="3">
WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp
+36 -12
View File
@@ -62,12 +62,22 @@
position: relative;
}
/* 어댑터, 메서드 라이브 서치 사용시 width 깨짐 방지 */
/* 어댑터, 메서드 select2 사용시 width 깨짐 방지 */
.select2-container {
width: 100% !important;
box-sizing: border-box;
}
/* 버튼 내용이 길어질 경우 말줄임표(...) 처리 */
.btn-ellipsis {
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
vertical-align: middle;
}
</style>
<script language="javascript" >
var isDetail = false;
@@ -319,17 +329,27 @@
}
}
function setStandardMessageItemsLabel(items, buttonId) {
const label = items.map(function(item) {
return item.COLUMNNAME + '=' + item.COLUMNVALUE;
}).join(';');
function setStandardMessageItemsLabel(items, buttonId) {
const label = items.map(function(item) {
return item.COLUMNNAME + '=' + item.COLUMNVALUE;
}).join(';');
if(items.length > 0) {
$('#'+buttonId).text('수정 ['+label+']');
} else {
$('#'+buttonId).text('수정');
}
}
const $btn = $('#' + buttonId);
if (items.length > 0) {
$btn.text('수정 [' + label + ']');
$btn.attr('title', '수정 [' + label + ']');
$btn.addClass('btn-ellipsis');
} else {
$btn.text('수정');
$btn.removeAttr('title');
$btn.removeClass('btn-ellipsis');
}
}
function setupStdCommonValueModal(type) {
currentStandardMessageType = type;
@@ -984,6 +1004,10 @@
$("#btn_modify").click(modifyApi);
$("#btn_delete").click(function(){
if(!confirm("삭제하시겠습니까?")){
return;
}
var postData = $('#ajaxForm').serializeArray();
postData.push({ name: "cmd" , value:"DELETE"});
@@ -1303,7 +1327,7 @@
alert(e.responseText);
},
complete: function() {
$("[id^='btn_']").prop("disabled", false);
$("[id=doCloneInterfaceButton]").prop("disabled", false);
$("#doCloneInterfaceButton").text("복제");
}
});
WebContent/jsp/onl/transaction/tracking/trackingMan.jsp
+3 -3
View File
@@ -373,16 +373,16 @@
{name: 'TRACKASISKEY1CTNT', hidden: true},
{name: 'TRACKASISKEY2CTNT', hidden: true},
{name: 'EAISVCSERNO_TMP', align: 'left', width: '230'},
{name: 'EAISVCSERNO_TMP', align: 'left', width: '220'},
{name: 'KEYMGTMSGCTNT', align: 'left', width: '240'},
{name: 'LOGPRCSSSERNO_TMP', align: 'center', width: '40'},
{name: 'TELGMRECVTRANCD', align: 'left', width: '135', hidden: true},
{name: 'EAISVCNAME', align: 'left', width: '100'},
{name: 'EAISVCNAME', align: 'left', width: '130'},
{name: 'EAISVCDESC', align: 'left', width: '280'},
{name: 'EAIBZWKDSTCD_TMP', align: 'center', width: '50'},
{name: 'EXTBIZCD', align: 'center', width: '50', hidden: isApiGw},
{name: 'REFKEY', align: 'left', width: '280', hidden: isApiGw},
{name: 'CLIENTNAME', align: 'left', width: '280', hidden: !isApiGw},
{name: 'CLIENTNAME', align: 'left', width: '260', hidden: !isApiGw},
{name: 'ORGNAME', align: 'left', width: '100', hidden: !isApiGw, formatter: orgNameFormatter},
{name: 'MSGDPSTYMS_TMP', align: 'center', width: '150', formatter: timeStampFormat2},
{name: 'MSGPRCSSYMS', align: 'center', width: '150', formatter: timeStampFormat2},