Merge remote-tracking branch 'origin/master'

- admin: elink-online-core 표준 위임(e메일/이름/전화/IP)으로 규칙 일원화
- portal/JS: 표준 로직 직접 구현 + 기존 owner 비마스킹 유지
- 호출처 무수정/인라인 중복 제거/테스트 통과

Jenkinsfile

@@ -0,0 +1,179 @@
+pipeline {
+  agent { label 'djb-vm' }
+
+  options {
+    timestamps()
+    disableConcurrentBuilds()
+    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20'))
+  }
+
+  environment {
+    JAVA_HOME = '/apps/opts/jdk8'
+    JAVA_HOME_TOMCAT = '/apps/opts/jdk17'
+    GRADLE_HOME = '/apps/opts/gradle-8.7'
+    GRADLE_USER_HOME = '/apps/opts/gradle-home'
+    NODE_HOME = '/apps/opts/node-v24'
+    PATH = "/apps/opts/jdk8/bin:/apps/opts/gradle-8.7/bin:/apps/opts/node-v24/bin:/apps/opts/bin:${env.PATH}"
+    GIT_SSH_COMMAND = 'ssh -o StrictHostKeyChecking=accept-new'
+    CATALINA_BASE = '/prod/eapim/adminportal'
+    CATALINA_HOME = '/prod/eapim/apache-tomcat-9.0.116'
+    CATALINA_PID = '/prod/eapim/adminportal/temp/catalina.pid'
+    DEPLOY_HTTP_PORT = '39120'
+  }
+
+  stages {
+    stage('Checkout') {
+      steps {
+        checkout scm
+      }
+    }
+
+    stage('Checkout dependencies') {
+      steps {
+        sh '''
+          set -eu
+          cd "$WORKSPACE/.."
+
+          mkdir -p eapim-online
+
+          for REPO in elink-online-core elink-online-core-jpa elink-online-transformer elink-online-common elink-online-emsclient; do
+            TARGET="eapim-online/$REPO"
+            if [ ! -d "$TARGET/.git" ]; then
+              rm -rf "$TARGET"
+              git clone --depth=1 --branch master \
+                "ssh://git@172.30.1.50:2222/djb-eapim/$REPO.git" \
+                "$TARGET"
+            else
+              git -C "$TARGET" fetch --depth=1 origin master
+              git -C "$TARGET" reset --hard origin/master
+              git -C "$TARGET" clean -fdx
+            fi
+          done
+
+          for REPO in elink-portal-common eapim-admin-djb; do
+            if [ ! -d "$REPO/.git" ]; then
+              rm -rf "$REPO"
+              git clone --depth=1 --branch master \
+                "ssh://git@172.30.1.50:2222/djb-eapim/$REPO.git" \
+                "$REPO"
+            else
+              git -C "$REPO" fetch --depth=1 origin master
+              git -C "$REPO" reset --hard origin/master
+              git -C "$REPO" clean -fdx
+            fi
+          done
+        '''
+      }
+    }
+
+    stage('Verify toolchain') {
+      steps {
+        sh '''
+          set -eu
+          java -version
+          gradle --version
+        '''
+      }
+    }
+
+    stage('Build WAR') {
+      steps {
+        sh 'gradle clean build -x test --no-daemon'
+      }
+      post {
+        success {
+          sh '''
+            set -eu
+            cd build/libs
+            sha1sum eapim-admin.war > SHA1SUMS
+            sha256sum eapim-admin.war > SHA256SUMS
+          '''
+          archiveArtifacts artifacts: 'build/libs/eapim-admin.war,build/libs/SHA1SUMS,build/libs/SHA256SUMS', fingerprint: true
+        }
+      }
+    }
+
+    stage('Stop Tomcat') {
+      steps {
+        sh '''
+          set +e
+          systemctl --user stop eapim-admin 2>/dev/null
+
+          if [ -f "$CATALINA_PID" ] && kill -0 "$(cat "$CATALINA_PID")" 2>/dev/null; then
+            JAVA_HOME="$JAVA_HOME_TOMCAT" "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
+            for i in $(seq 1 30); do
+              [ -f "$CATALINA_PID" ] && kill -0 "$(cat "$CATALINA_PID")" 2>/dev/null || break
+              sleep 1
+            done
+          fi
+          rm -f "$CATALINA_PID"
+        '''
+      }
+    }
+
+    stage('Deploy monitoring.war') {
+      steps {
+        sh '''
+          set -eu
+          DEPLOY_DIR="$CATALINA_BASE/webapps"
+          rm -rf "$DEPLOY_DIR/monitoring" "$DEPLOY_DIR/monitoring.war"
+          cp build/libs/eapim-admin.war "$DEPLOY_DIR/monitoring.war"
+          ls -la "$DEPLOY_DIR"
+        '''
+      }
+    }
+
+    stage('Start Tomcat and readiness') {
+      steps {
+        sh '''
+          set -eu
+          LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log"
+          BEFORE=0
+          [ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG")
+
+          systemctl --user start eapim-admin
+
+          PROBE_URL="http://localhost:$DEPLOY_HTTP_PORT/monitoring/loginForm.do"
+          DEADLINE=$(($(date +%s) + 300))
+          STATUS=000
+
+          while [ "$(date +%s)" -lt "$DEADLINE" ]; do
+            STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \
+              "$PROBE_URL" 2>/dev/null || echo "000")
+            case "$STATUS" in
+              200|302|401)
+                echo "Readiness OK ($PROBE_URL HTTP $STATUS)"
+                break
+                ;;
+            esac
+
+            if [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | grep -qE "Application listener .* Exception|SEVERE.*startup.Catalina"; then
+              echo "Startup error detected in log"
+              tail -c +$((BEFORE+1)) "$LOG" | tail -80
+              exit 1
+            fi
+            sleep 2
+          done
+
+          case "$STATUS" in
+            200|302|401) ;;
+            *)
+              echo "Readiness probe failed within 300s, last HTTP status: $STATUS"
+              echo "--- last 300 lines of catalina log ---"
+              [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -300
+              echo "--- systemd unit status ---"
+              systemctl --user status eapim-admin --no-pager || true
+              echo "--- listening ports ---"
+              ss -tlnp 2>/dev/null | grep -E ":$DEPLOY_HTTP_PORT\\b" || echo "(port $DEPLOY_HTTP_PORT not listening)"
+              exit 1
+              ;;
+          esac
+
+          echo "--- key boot log lines ---"
+          tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true
+        '''
+      }
+    }
+  }
+
+}

WebContent/WEB-INF/auditpoints.dat

@@ -12,6 +12,6 @@ PortalTermsManController_약관관리_APIGW_INSERT,UPDATE,DELETE
 ProdClientManController_운영Client (키정보)관리_APIGW_INSERT,UPDATE,DELETE
 ApiSpecController_API스펙관리_APIGW_INSERT,DELETE
 MessageTemplateManController_메세지템플릿관리_APIGW_INSERT,UPDATE,DELETE
-PortalPartnershipManController_사업제휴신청관리_APIGW_UNMASK
+PortalPartnershipManController_피드백/개선요청관리_APIGW_UNMASK,DELETE
 PortalPropertyController_포탈 프로퍼티 관리_APIGW_UPDATE
 PortalUserTermsManController_약관동의 이력_APIGW_UNMASK

WebContent/jsp/js/stringMaskingUtil.js

@@ -1,5 +1,10 @@
 /**
  * 문자열 마스킹 처리를 위한 유틸리티
+ *
+ * 보안아키텍처 표준 마스킹 규칙(Java MaskingUtils)과 동일한 결과를 내도록 구현한다.
+ *   이름   2자: 뒤 1자리(가나→가*) / 3자 이상: 앞뒤 제외 가운데 전체(가나다라→가**라)
+ *   이메일 아이디 앞2·뒤2 마스킹, 4자 이하 전체(test→****, test123→**st1**)
+ *   전화   2·3번째 세그먼트 각각 뒤 2자리(010-1234-1234→010-12**-12**)
  */
 const StringMaskingUtil = {
 
@@ -8,41 +13,51 @@ const StringMaskingUtil = {
         return str != null && str !== '';
     },
 
-    // 이름 마스킹 처리
+    // '*' 반복 생성
+    _stars: function(count) {
+        return count > 0 ? '*'.repeat(count) : '';
+    },
+
+    // 세그먼트 뒤 count 자리 마스킹
+    _maskSegmentTail: function(segment, count) {
+        if (segment.length <= count) {
+            return this._stars(segment.length);
+        }
+        return segment.substring(0, segment.length - count) + this._stars(count);
+    },
+
+    // 이름 마스킹 처리 (2자: 뒤 1자리, 3자 이상: 앞뒤 제외 가운데 전체)
     maskName: function(name) {
         if (!this.isValidString(name)) {
             return name;
         }
-        return name.length > 1 ?
-            name.substring(0, name.length - 1) + "*" :
-            name;
+        const len = name.length;
+        if (len === 1) {
+            return name;
+        }
+        if (len === 2) {
+            return name.charAt(0) + '*';
+        }
+        return name.charAt(0) + this._stars(len - 2) + name.charAt(len - 1);
     },
 
-    // 이메일 마스킹 처리
+    // 이메일 마스킹 처리 (아이디 앞2·뒤2, 4자 이하 전체)
     maskEmail: function(email) {
         if (!this.isValidString(email) || !email.includes('@')) {
             return email;
         }
 
-        const parts = email.split('@');
-        if (parts.length !== 2) {
-            return email;
+        const atIdx = email.indexOf('@');
+        const local = email.substring(0, atIdx);
+        const domain = email.substring(atIdx);
+
+        if (local.length <= 4) {
+            return this._stars(local.length) + domain;
         }
-
-        const localPart = parts[0];
-        let maskedLocal;
-
-        if (localPart.length <= 3) {
-            maskedLocal = localPart.substring(0, 1) +
-                '*'.repeat(localPart.length - 1);
-        } else {
-            maskedLocal = localPart.substring(0, localPart.length - 3) + '***';
-        }
-
-        return maskedLocal + '@' + parts[1];
+        return this._stars(2) + local.substring(2, local.length - 2) + this._stars(2) + domain;
     },
 
-    // 휴대폰 번호 마스킹 처리
+    // 휴대폰/전화 번호 마스킹 처리 (2·3번째 세그먼트 각각 뒤 2자리)
     maskMobileNumber: function(number) {
         if (!this.isValidString(number)) {
             return number;
@@ -50,8 +65,10 @@ const StringMaskingUtil = {
 
         const parts = number.split('-');
         if (parts.length === 3) {
-            return parts[0] + '-****-' + parts[2];
+            return parts[0] + '-' +
+                this._maskSegmentTail(parts[1], 2) + '-' +
+                this._maskSegmentTail(parts[2], 2);
         }
         return number;
     }
-};
+};

WebContent/jsp/onl/apim/portalnotice/portalNoticeMan.jsp

@@ -20,7 +20,9 @@
 		var combo;
 		
 		function formatNoticeType(cellvalue, options, rowObject) {
-			var name = "";
+			if (!combo || !combo.noticeTypeList) {
+				return cellvalue;
+			}
 			for (var i = 0; i < combo.noticeTypeList.length; i++) {
 				if (combo.noticeTypeList[i].CODE == cellvalue) {
 					return combo.noticeTypeList[i].NAME;	
@@ -89,8 +91,11 @@
 					console.log('init', json);
 					combo = json;
 					new makeOptions("CODE","NAME").setObj($("select[name=searchNoticeType]")).setNoValueInclude(true).setNoValue('','<%=localeMessage.getString("combo.all")%>').setData(json.noticeTypeList).rendering();
-				
+
 					putSelectFromParam();
+
+					// 콤보(combo)가 채워진 뒤에 그리드를 생성해야 formatNoticeType 경합이 발생하지 않음
+					buildGrid();
 				},
 				error:function(e){
 					alert(e.responseText);
@@ -98,8 +103,8 @@
 			});
 		}
 
-		$(document).ready(function() {
-						
+		function buildGrid(){
+
 			$('#grid').jqGrid({
 				datatype:"json",
 				mtype: 'POST',
@@ -172,9 +177,13 @@
 				}
 			});
 
-			init();
-
 			resizeJqGridWidth('grid','content_middle','1000');
+		}
+
+		$(document).ready(function() {
+
+			// 콤보 로드 → 콤보 성공 콜백에서 buildGrid() 호출 (경합 방지)
+			init();
 
 			$("#btn_search").click(function(){
 				var postData = getSearchForJqgrid("cmd","LIST");

WebContent/jsp/onl/apim/portalpartnership/portalPartnershipMan.jsp

@@ -26,7 +26,38 @@ function formatFile(cellvalue, options, rowObject) {
 	return cellvalue + icon;
 }
 
-$(document).ready(function() {	
+function deleteSelectedRows() {
+	var selectedIds = $("#grid").jqGrid('getGridParam', 'selarrrow');
+
+	if (selectedIds.length === 0) {
+		alert('항목을 선택하세요.');
+		return;
+	}
+
+	if (!confirm('선택된 ' + selectedIds.length + '개 항목을 삭제하시겠습니까?')) {
+		return;
+	}
+
+	$.ajax({
+		type: "POST",
+		url: url,
+		dataType: "json",
+		data: {
+			cmd: 'DELETE_BULK',
+			ids: selectedIds.join(',')
+		},
+		success: function(data) {
+			alert('삭제되었습니다.');
+			$("#grid").jqGrid('clearGridData', true);
+			$("#grid").trigger("reloadGrid");
+		},
+		error: function(e) {
+			alert('삭제 중 오류가 발생했습니다.');
+		}
+	});
+}
+
+$(document).ready(function() {
 	$('#grid').jqGrid({
 		datatype:"json",
 		mtype: 'POST',
@@ -45,7 +76,7 @@ $(document).ready(function() {
 				],
         jsonReader: {
              repeatitems:false
-        },	          
+        },
 		pager : $('#pager'),
 		page : '${param.page}',
 		rowNum : '${rmsDefaultRowNum}',
@@ -54,6 +85,8 @@ $(document).ready(function() {
 		autowidth: true,
 		viewrecords: true,
 		rowList : eval('[${rmsDefaultRowList}]'),
+		multiselect: true,
+		multiboxonly: true,
 		ondblClickRow: function(rowId) {
 			var rowData = $(this).getRowData(rowId); 
             var id = rowData['id'];
@@ -94,10 +127,14 @@ $(document).ready(function() {
 	resizeJqGridWidth('grid','content_middle','1000');
 
 	$("#btn_search").click(function(){
-		var postData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로 
+		var postData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로
 		$("#grid").setGridParam({ url:url,postData: postData ,page:1 }).trigger("reloadGrid");
 	});
 
+	$("#btn_delete_selected").click(function(){
+		deleteSelectedRows();
+	});
+
 	$("input[name^=search]").keydown(function(key){
 		if (key.keyCode == 13){
 			$("#btn_search").click();
@@ -120,8 +157,9 @@ $(document).ready(function() {
 			<div class="content_middle" id="content_middle">
 				<div class="search_wrap">
 					<button type="button" class="cssbtn" id="btn_search" level="R" ><i class="material-icons">search</i> <%= localeMessage.getString("button.search") %></button>
+					<button type="button" class="cssbtn" id="btn_delete_selected" level="W" style="background-color: #dc3545; border-color: #dc3545; color: white;"><i class="material-icons">delete_forever</i> 선택 삭제</button>
 				</div>
-				<div class="title">사업제휴 신청 목록</div>
+				<div class="title">피드백/개선요청 신청 목록</div>
 				<form id="ajaxForm"  onsubmit="return false;">
 					<table class="search_condition" cellspacing=0;>
 						<tbody>

WebContent/jsp/onl/apim/portalpartnership/portalPartnershipManDetail.jsp

@@ -92,6 +92,27 @@ $(document).ready(function() {
 		goNav(returnUrl);//LIST로 이동
 	});
 
+	$("#btn_delete").click(function(){
+		if (!confirm('선택한 항목을 삭제하시겠습니까?')) {
+			return;
+		}
+
+		$.ajax({
+			type: "POST",
+			url: url,
+			dataType: "json",
+			data: { cmd: 'DELETE', id: key },
+			success: function(data) {
+				alert('삭제되었습니다.');
+				var returnUrl = getReturnUrlForReturn();
+				goNav(returnUrl);//LIST로 이동
+			},
+			error: function(e) {
+				alert('삭제 중 오류가 발생했습니다.');
+			}
+		});
+	});
+
 	$("#btn_unmask").click(function () {
 		const reason = prompt("마스킹 해제 사유를 입력하세요:");
 
@@ -134,9 +155,10 @@ $(document).ready(function() {
 			<div class="content_middle">
 				<div class="search_wrap">
 					<button type="button" class="cssbtn" id="btn_unmask" level="W" status="DETAIL"><i class="material-icons">lock_open</i> 마스킹해제</button>
+					<button type="button" class="cssbtn" id="btn_delete" level="W" status="DETAIL" style="background-color: #dc3545; border-color: #dc3545; color: white;"><i class="material-icons">delete_forever</i> 삭제</button>
 					<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">사업제휴 신청 상세</div>
+				<div class="title">피드백/개선요청 신청 상세</div>
 
 				<table id="grid" ></table>
 				<div id="pager"></div>

WebContent/jsp/onl/kjb/statistics/apiUseStatsMan.jsp

@@ -222,7 +222,7 @@
 			$("input[name=searchStartDate], input[name=searchEndDate]").datepicker();
 			
 			var today = getToday();
-			var startDate = today;
+			var startDate = today.substring(0,6)+"01";
 			var endDate = today;
 			
 
@@ -234,6 +234,7 @@
 			}
 
 			list();
+			search();
 
 			resizeJqGridWidth('grid', 'content_middle', '1200');
 

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

@@ -57,7 +57,7 @@ public class ClusteredSchedulerConfig {
       
       quartzProperties.put("org.quartz.jobStore.misfireThreshold", "60000");
       quartzProperties.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX");
-      quartzProperties.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");
+      quartzProperties.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.StdJDBCDelegate");
       quartzProperties.put("org.quartz.jobStore.useProperties", "false");
       quartzProperties.put("org.quartz.jobStore.dataSource", monitoringSchema);
       quartzProperties.put("org.quartz.jobStore.tablePrefix", monitoringSchema + ".QRTZ_");

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

@@ -124,6 +124,7 @@ public class EMSSchedulerImpl implements EMSScheduler {
    public void reloadJob(String jobName) throws SchedulerException, ClassNotFoundException {
       JobInfo jobInfo = jobInfoService.getById(jobName);
       if (CLUSTERED.equals(jobInfo.getInstanceName())) {
+         deleteJob(scheduler, jobName);
          reloadClusteredJob(jobInfo);
       } else {
          deleteAndAddJob(scheduler, jobInfo);
@@ -132,26 +133,37 @@ public class EMSSchedulerImpl implements EMSScheduler {
    }
 
    private void reloadClusteredJob(JobInfo jobInfo) throws SchedulerException, ClassNotFoundException {
-      TriggerKey triggerKey = new TriggerKey(getTriggerName(jobInfo.getId()), Scheduler.DEFAULT_GROUP);
+      String jobId = jobInfo.getId();
+      TriggerKey triggerKey = new TriggerKey(getTriggerName(jobId), Scheduler.DEFAULT_GROUP);
+      JobKey jobKey = new JobKey(jobId, Scheduler.DEFAULT_GROUP);
+
       Trigger existing = clusteredScheduler.getTrigger(triggerKey);
-      if (existing != null) {
+      JobDetail existingJob = clusteredScheduler.getJobDetail(jobKey);
+
+      if (existing != null && existingJob != null) {
          CronTrigger newTrigger = newTrigger()
                .withIdentity(triggerKey)
                .withSchedule(cronSchedule(jobInfo.getCronExp()))
                .build();
          Date ft = clusteredScheduler.rescheduleJob(triggerKey, newTrigger);
-         log.info("{} rescheduled at: {} cron: {}", jobInfo.getId(), ft, jobInfo.getCronExp());
-      } else {
-         deleteAndAddJob(clusteredScheduler, jobInfo);
+         if (ft != null) {
+            return;
+         }
+         log.warn("[reloadClusteredJob] {} rescheduleJob returned null, falling back to deleteAndAddJob", jobId);
+      } else if (existing != null) {
+         // orphaned trigger (job missing) — clean up before re-adding
+         log.warn("[reloadClusteredJob] {} has orphaned trigger without job, unscheduling", jobId);
+         clusteredScheduler.unscheduleJob(triggerKey);
       }
+      deleteAndAddJob(clusteredScheduler, jobInfo);
    }
 
    public void deleteJob(Scheduler inScheduler, String jobNm) throws SchedulerException {
+      String schedulerType = (inScheduler == clusteredScheduler) ? "clusteredScheduler" : "scheduler";
 		JobKey key = new JobKey(jobNm, Scheduler.DEFAULT_GROUP);
       JobDetail jobDetail = inScheduler.getJobDetail(key);
 		if (jobDetail != null) {
          inScheduler.deleteJob(key);
-			log.info(jobNm + " has been scheduled to deleted");
 		}
 	}
 
@@ -177,10 +189,7 @@ public class EMSSchedulerImpl implements EMSScheduler {
 					.withSchedule(cronSchedule(info.getCronExp()))
 					.build();
 
-         Date ft = inScheduler.scheduleJob(job, trigger);
-			log
-					.info("{} has been scheduled to run at: {} and repeat based on expression: {}", job.getKey(), ft,
-							trigger.getCronExpression());
+         inScheduler.scheduleJob(job, trigger);
 		}
 	}
 

src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalpartnerslhip/PortalPartnershipService.java

@@ -10,10 +10,16 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 @Transactional(transactionManager = "transactionManagerForEMS")
 public class PortalPartnershipService extends AbstractEMSDataSerivce<PartnershipApplication, String, PortalPartnershipRepository> {
 
+	public void deleteByIds(List<String> ids) {
+		repository.deleteAllById(ids);
+	}
+
 	public Page<PartnershipApplication> findAll(Pageable pageable, String searchBizSubject, String searchBizDetail) {
 		QPartnershipApplication qPartnershipApplication = QPartnershipApplication.partnershipApplication;
 

src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portaluser/PortalUserService.java

@@ -77,6 +77,10 @@ public class PortalUserService extends AbstractEMSDataSerivce<PortalUser, String
     }
 
     public PortalUser findByUserId(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return null;
+        }
+
         QPortalUser qPortalUser = QPortalUser.portalUser;
 
         return getJPAQueryFactory()

src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java

@@ -26,10 +26,10 @@ public class ApiStatusService {
 
     @Autowired
     private ApiStatusRepository apiStatusRepository;
-    
+
     @Autowired
-    private UmsManager ums; 
-    
+    private UmsManager ums;
+
     @Autowired
     private ApiStatusDetectionService apiStatusDectionService;
     
@@ -55,7 +55,8 @@ public class ApiStatusService {
             apiStatus.setEaisvcname(event.getEaisvcname());
             apiStatus.setStatusCode(newStatusCode);
 
-            apiStatusRepository.save(apiStatus);  // PK 있으면 UPDATE, 없으면 INSERT
+            apiStatusRepository.saveAndFlush(apiStatus);  // PK 있으면 UPDATE, 없으면 INSERT (즉시 flush)
+            
             log.debug("API 상태 변경: {}-{} {} → {}", event.getEaisvcname(), event.getEaisvcdesc(), event.getEvent(), newStatusCode);
             
         	

src/main/java/com/eactive/eai/rms/ext/djb/statistics/ApiUseStatsService.java

@@ -85,7 +85,7 @@ public class ApiUseStatsService
 				+ " ORDER BY ORGNAME";
 		} else if ("API".equals(search.getSearchType())) {
 			dataSql = "SELECT COUNT(*) OVER () AS RECORDS "
-					+ ", C.EAISVCDESC"
+					+ ", A.API_NAME"
 					+ ", SUM(A.TOTAL_CNT)"
 					+ ", SUM(A.SUCCESS_CNT)"
 					+ ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN SUM(A.SUCCESS_CNT) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END"
@@ -99,8 +99,8 @@ public class ApiUseStatsService
 					+ " LEFT OUTER JOIN TSEAIAU01 B ON A.CLIENT_ID = B.CLIENTID"
 					+ " LEFT OUTER JOIN TSEAIHE01 C ON A.API_NAME  = C.EAISVCNAME "
 					+ where
-					+ " GROUP BY C.EAISVCDESC"
-					+ " ORDER BY EAISVCDESC";
+					+ " GROUP BY A.API_NAME"
+					+ " ORDER BY API_NAME";
 		} else if ("DATE".equals(search.getSearchType())) {
 			dataSql = "SELECT COUNT(*) OVER () AS RECORDS "
 					+ ", TO_CHAR(STAT_TIME,'YYYY-MM-DD') AS STAT_TIME "

src/main/java/com/eactive/eai/rms/ext/kjb/smsauth/SmsAuthService.java

@@ -267,17 +267,14 @@ public class SmsAuthService {
     }
 
     /**
-     * 전화번호 마스킹
+     * 전화번호 마스킹 (표준 규칙: 2·3번째 세그먼트 각각 뒤 2자리)
+     * 예: 010-1234-5678 → 010-12**-56**
      */
     public String maskPhoneNumber(String phone) {
         if (StringUtils.isEmpty(phone)) {
             return "****";
         }
-        String cleaned = phone.replaceAll("[^0-9]", "");
-        if (cleaned.length() < 7) {
-            return "****";
-        }
-        return cleaned.substring(0, 3) + "****" + cleaned.substring(cleaned.length() - 4);
+        return com.eactive.eai.common.util.MaskingUtils.maskPhoneNumber(phone);
     }
 
     /**

src/main/java/com/eactive/eai/rms/ext/kjb/sso/SsoController.java

@@ -134,8 +134,8 @@ public class SsoController implements InterceptorSkipController {
                 log.debug("SSO 사용자 정보 - userId: {}, name: {}, phone: {}, email: {}",
                         userId,
                         MaskingUtils.maskName(name),
-                        maskPhoneNumber(cellPhoneNo),
-                        maskEmail(email));
+                        MaskingUtils.maskPhoneNumber(cellPhoneNo),
+                        MaskingUtils.maskEmailId(email));
 
                 // 사용자 생성 또는 업데이트
                 UserInfo userInfo = findOrCreateUser(info, extendedInfo);
@@ -341,33 +341,4 @@ public class SsoController implements InterceptorSkipController {
         }
         return phone.replaceAll("[^0-9]", "");
     }
-
-    /**
-     * 휴대폰번호 마스킹 (로그용)
-     */
-    private String maskPhoneNumber(String phone) {
-        if (StringUtils.isEmpty(phone) || phone.length() < 4) {
-            return "****";
-        }
-        // 010-1234-5678 → 010-****-5678
-        String cleaned = phone.replaceAll("[^0-9]", "");
-        if (cleaned.length() < 7) {
-            return "****";
-        }
-        return cleaned.substring(0, 3) + "****" + cleaned.substring(cleaned.length() - 4);
-    }
-
-    /**
-     * 이메일 마스킹 (로그용)
-     */
-    private String maskEmail(String email) {
-        if (StringUtils.isEmpty(email) || !email.contains("@")) {
-            return "****";
-        }
-        int atIndex = email.indexOf("@");
-        if (atIndex <= 2) {
-            return "**" + email.substring(atIndex);
-        }
-        return email.substring(0, 2) + "**" + email.substring(atIndex);
-    }
 }

src/main/java/com/eactive/eai/rms/onl/apim/masking/MaskingUtils.java

@@ -1,83 +1,52 @@
 package com.eactive.eai.rms.onl.apim.masking;
 
-import com.eactive.eai.rms.common.util.StringUtils;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
+/**
+ * 개인정보 마스킹 유틸리티 (eapim-admin)
+ *
+ * <p>실제 마스킹 규칙은 보안아키텍처 표준 구현인
+ * {@link com.eactive.eai.common.util.MaskingUtils}(elink-online-core)에 위임한다.
+ * 기존 호출부 호환을 위해 메서드명/시그니처는 그대로 유지한다.</p>
+ *
+ * <pre>
+ *   이메일   eact***@gmail.com (구) → **ct1**@gmail.com (앞2·뒤2, 4자 이하 전체)
+ *   이름     홍길* (구) → 홍*동 (2자 뒤1, 3자↑ 가운데 전체)
+ *   전화     010-****-5678 (구) → 010-12**-56** (세그먼트별 뒤 2자리)
+ *   IPv4     192.168.***.1 (3번째 옥텟) / IPv6 마지막 그룹, 콤마 다중 IP 지원
+ * </pre>
+ */
 public class MaskingUtils {
+
+    private MaskingUtils() {}
+
     /**
      * 이메일 주소의 ID 부분을 마스킹 처리
-     * 예: eactive@gmail.com => eact***@gmail.com
+     * 예: aajjbacc@gmail.com => **jjba**@gmail.com
      */
     public static String maskEmailId(String email) {
-        if (email == null || email.isEmpty() || !email.contains("@")) {
-            return email;
-        }
-
-        String[] parts = email.split("@");
-        String id = parts[0];
-        String domain = parts[1];
-
-        if (id.length() <= 3) {
-            return "***" + "@" + domain;
-        }
-
-        String maskedId = id.substring(0, id.length() - 3) + "***";
-        return maskedId + "@" + domain;
+        return com.eactive.eai.common.util.MaskingUtils.maskEmail(email);
     }
 
     /**
-     * 이름의 마지막 글자를 마스킹 처리
+     * 이름 마스킹 처리 (2자: 뒤 1자리, 3자 이상: 앞뒤 제외 가운데 전체)
+     * 예: 홍길동 => 홍*동
      */
     public static String maskName(String name) {
-        if (name == null || name.isEmpty() || name.length() < 2) {
-            return name;
-        }
-
-        return name.substring(0, name.length() - 1) + "*";
+        return com.eactive.eai.common.util.MaskingUtils.maskKoreanName(name);
     }
 
     /**
-     * 전화번호 마스킹 처리
-     * 예: 010-1234-5678 => 010-****-5678
+     * 전화번호/휴대폰/FAX 마스킹 처리 (2·3번째 세그먼트 각각 뒤 2자리)
+     * 예: 010-1234-5678 => 010-12**-56**
      */
     public static String maskPhoneNumber(String phoneNumber) {
-        if (phoneNumber == null || phoneNumber.isEmpty()) {
-            return phoneNumber;
-        }
-
-        String[] parts = phoneNumber.split("-");
-        if (parts.length != 3) {
-            return phoneNumber;
-        }
-
-        return parts[0] + "-****-" + parts[2];
+        return com.eactive.eai.common.util.MaskingUtils.maskPhoneNumber(phoneNumber);
     }
 
     /**
-     * IP 주소 마스킹 처리
-     * 예: 192.168.1.1 => 192.168.*.*
+     * IP 주소 마스킹 처리 (IPv4 3번째 옥텟 / IPv6 마지막 그룹, 콤마 다중 IP 지원)
+     * 예: 192.168.1.1 => 192.168.***.1
      */
     public static String maskIpAddress(String ipAddresses) {
-        if (StringUtils.isBlank(ipAddresses)) {
-            return ipAddresses;
-        }
-
-        String[] ips = ipAddresses.split(",");
-        List<String> maskedIps = Arrays.stream(ips)
-                .map(ip -> {
-                    String[] parts = ip.trim().split("\\.");
-                    if (parts.length == 4) {
-                        // 세 번째 octet을 ***로 마스킹
-                        parts[2] = "***";
-                        return String.join(".", parts);
-                    }
-                    return ip; // 유효하지 않은 IP 형식은 그대로 반환
-                })
-                .collect(Collectors.toList());
-
-        return String.join(",", maskedIps);
+        return com.eactive.eai.common.util.MaskingUtils.maskIpAddress(ipAddresses);
     }
 }

src/main/java/com/eactive/eai/rms/onl/apim/portalpartnership/PortalPartnershipManController.java

@@ -55,4 +55,16 @@ public class PortalPartnershipManController extends BaseAnnotationController {
 		return ResponseEntity.ok(portalPartnershipUI);
 	}
 
+	@PostMapping(value = "/onl/apim/portalpartnership/portalPartnershipMan.json", params = "cmd=DELETE")
+	public ResponseEntity<Void> delete(String id) {
+		portalPartnershipManService.delete(id);
+		return ResponseEntity.ok().build();
+	}
+
+	@PostMapping(value = "/onl/apim/portalpartnership/portalPartnershipMan.json", params = "cmd=DELETE_BULK")
+	public ResponseEntity<Void> deleteBulk(String ids) {
+		portalPartnershipManService.deleteBulk(ids);
+		return ResponseEntity.ok().build();
+	}
+
 }

src/main/java/com/eactive/eai/rms/onl/apim/portalpartnership/PortalPartnershipManService.java

@@ -15,6 +15,10 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
 @Service
 @Transactional(transactionManager = "transactionManagerForEMS")
 public class PortalPartnershipManService extends BaseService {
@@ -51,18 +55,48 @@ public class PortalPartnershipManService extends BaseService {
 		return convertToUIWithMaskOption(partnershipApplication, false);
 	}
 
+	public void delete(String id) {
+		PartnershipApplication partnership = partnershipService.getById(id);
+		Optional.ofNullable(partnership.getFileId())
+				.filter(StringUtils::isNotBlank)
+				.ifPresent(fileService::deleteFile);
+		partnershipService.deleteById(id);
+	}
+
+	public void deleteBulk(String ids) {
+		if (StringUtils.isBlank(ids)) {
+			return;
+		}
+
+		List<String> idList = Arrays.asList(ids.split(","));
+
+		// 첨부파일 정리 (단건 삭제와 동일한 처리)
+		idList.forEach(id -> {
+			PartnershipApplication partnership = partnershipService.getById(id);
+			Optional.ofNullable(partnership.getFileId())
+					.filter(StringUtils::isNotBlank)
+					.ifPresent(fileService::deleteFile);
+		});
+
+		partnershipService.deleteByIds(idList);
+	}
+
 	private PortalPartnershipUI convertToUIWithMaskOption(PartnershipApplication partnership, boolean isMasked) {
 		PortalPartnershipUI partnershipUI = portalPartnershipUIMapper.toVo(partnership);
 		PortalUser user = findUser(partnership.getCreatedBy());
 
+		// 작성자(createdBy)에 해당하는 포털 사용자가 없을 수 있음(탈퇴/삭제, 시스템 작성 등)
+		String userName = user != null ? user.getUserName() : null;
+		String loginId = user != null ? user.getLoginId() : null;
+
 		if (isMasked) {
 			// 마스킹 처리
-			partnershipUI.setCreatedByName(MaskingUtils.maskName(user.getUserName()));
-			partnershipUI.setCreatedById(MaskingUtils.maskEmailId(user.getLoginId()));
+			partnershipUI.setCreatedByName(MaskingUtils.maskName(userName));
+			partnershipUI.setCreatedById(MaskingUtils.maskEmailId(loginId));
 		} else {
 			// 마스킹 해제 상태
-			partnershipUI.setCreatedByName(user.getUserName());
-			partnershipUI.setCreatedById(user.getLoginId());
+			partnershipUI.setCreatedByName(userName);
+			partnershipUI.setCreatedById(loginId);
 		}
 
 		// 첨부파일 처리

src/test/java/com/eactive/eai/rms/onl/apim/masking/MaskingUtilsTest.java

@@ -0,0 +1,128 @@
+package com.eactive.eai.rms.onl.apim.masking;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+/**
+ * eapim-admin {@link MaskingUtils}가 보안아키텍처 표준 규칙(elink-online-core)으로
+ * 위임되어 동작하는지 검증한다.
+ */
+class MaskingUtilsTest {
+
+    // --- 이메일 (maskEmailId) ---
+
+    @Test
+    @DisplayName("이메일 — 아이디 앞2·뒤2 마스킹")
+    void maskEmailId_normal() {
+        assertEquals("**st1**@test.com", MaskingUtils.maskEmailId("test123@test.com"));
+    }
+
+    @Test
+    @DisplayName("이메일 — 아이디 4자: 전체 마스킹")
+    void maskEmailId_fourChars() {
+        assertEquals("****@test.com", MaskingUtils.maskEmailId("test@test.com"));
+    }
+
+    @Test
+    @DisplayName("이메일 — 아이디 1자: 전체 마스킹")
+    void maskEmailId_oneChar() {
+        assertEquals("*@123.com", MaskingUtils.maskEmailId("1@123.com"));
+    }
+
+    @Test
+    @DisplayName("이메일 — @ 없으면 원본 / null·빈문자 방어")
+    void maskEmailId_invalidAndNull() {
+        assertEquals("notanemail", MaskingUtils.maskEmailId("notanemail"));
+        assertNull(MaskingUtils.maskEmailId(null));
+        assertEquals("", MaskingUtils.maskEmailId(""));
+    }
+
+    // --- 이름 (maskName) ---
+
+    @Test
+    @DisplayName("이름 — 2자: 뒤 1자리")
+    void maskName_2chars() {
+        assertEquals("가*", MaskingUtils.maskName("가나"));
+    }
+
+    @Test
+    @DisplayName("이름 — 3자: 가운데 1자리")
+    void maskName_3chars() {
+        assertEquals("가*다", MaskingUtils.maskName("가나다"));
+    }
+
+    @Test
+    @DisplayName("이름 — 4자: 앞뒤 제외 가운데 전체")
+    void maskName_4chars() {
+        assertEquals("가**라", MaskingUtils.maskName("가나다라"));
+    }
+
+    @Test
+    @DisplayName("이름 — 5자: 앞뒤 제외 가운데 전체")
+    void maskName_5chars() {
+        assertEquals("가***마", MaskingUtils.maskName("가나다라마"));
+    }
+
+    @Test
+    @DisplayName("이름 — 1자/null/빈문자 방어")
+    void maskName_oneAndNull() {
+        assertEquals("가", MaskingUtils.maskName("가"));
+        assertNull(MaskingUtils.maskName(null));
+        assertEquals("", MaskingUtils.maskName(""));
+    }
+
+    // --- 전화/휴대폰/Fax (maskPhoneNumber) ---
+
+    @Test
+    @DisplayName("전화 — 2·3번째 세그먼트 각 뒤 2자리")
+    void maskPhoneNumber_normal() {
+        assertEquals("010-12**-12**", MaskingUtils.maskPhoneNumber("010-1234-1234"));
+        assertEquals("064-12**-56**", MaskingUtils.maskPhoneNumber("064-1234-5678"));
+    }
+
+    @Test
+    @DisplayName("전화 — 하이픈 없는 11자리")
+    void maskPhoneNumber_noHyphen() {
+        assertEquals("01012**56**", MaskingUtils.maskPhoneNumber("01012345678"));
+    }
+
+    @Test
+    @DisplayName("전화 — null/빈문자 방어")
+    void maskPhoneNumber_null() {
+        assertNull(MaskingUtils.maskPhoneNumber(null));
+        assertEquals("", MaskingUtils.maskPhoneNumber(""));
+    }
+
+    // --- IP (maskIpAddress) ---
+
+    @Test
+    @DisplayName("IPv4 — 3번째 옥텟 마스킹")
+    void maskIpAddress_ipv4() {
+        assertEquals("172.0.***.1", MaskingUtils.maskIpAddress("172.0.0.1"));
+        assertEquals("192.168.***.1", MaskingUtils.maskIpAddress("192.168.100.1"));
+    }
+
+    @Test
+    @DisplayName("IPv6 — 마지막 그룹 마스킹")
+    void maskIpAddress_ipv6() {
+        assertEquals(
+            "AAAA:BBBB:CCCC:DDDD:EEEE:FFFF:0000:****",
+            MaskingUtils.maskIpAddress("AAAA:BBBB:CCCC:DDDD:EEEE:FFFF:0000:1111"));
+    }
+
+    @Test
+    @DisplayName("IP — 쉼표 구분 다중 IPv4")
+    void maskIpAddress_multiple() {
+        assertEquals("192.168.***.1,10.0.***.2", MaskingUtils.maskIpAddress("192.168.100.1,10.0.0.2"));
+    }
+
+    @Test
+    @DisplayName("IP — null/빈문자 방어")
+    void maskIpAddress_null() {
+        assertNull(MaskingUtils.maskIpAddress(null));
+        assertEquals("", MaskingUtils.maskIpAddress(""));
+    }
+}