공지사항 관리 - 장애/점검 등록 UI 추가

- PortalNoticeUI: 장애/점검 필드 신설 (시작/종료/상태/영향API)
- PortalNoticeManService: djb_apistatus_incident 연동 분기
- 등록 폼: 동적 유형별 UI + 영향 API 팝업 (showModal)

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

.gitea/workflows/eapim-admin-ci.yml

@@ -1,140 +0,0 @@
-name: eapim-admin CI
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-      - stage
-      - feats/ci-test
-
-jobs:
-  build:
-    runs-on: [self-hosted, linux, eapim-admin]
-    env:
-      JAVA_HOME: /apps/opts/jdk8
-      JAVA_HOME_TOMCAT: /apps/opts/jdk17
-      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"
-    defaults:
-      run:
-        working-directory: eapim-admin
-
-    steps:
-      - name: Checkout eapim-admin (trigger SHA)
-        uses: http://172.30.1.50:3000/actions/checkout@v4
-        with:
-          path: eapim-admin
-
-      - name: Checkout sibling modules (master)
-        working-directory: ${{ github.workspace }}
-        run: |
-          set -e
-          mkdir -p eapim-online
-
-          # eapim-online/* — 5 modules referenced from settings.gradle
-          for REPO in elink-online-core elink-online-core-jpa elink-online-transformer elink-online-common elink-online-emsclient; do
-            rm -rf "eapim-online/$REPO"
-            git clone --depth=1 --branch master \
-              http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/$REPO.git \
-              "eapim-online/$REPO"
-          done
-
-          # standalone siblings
-          for REPO in elink-portal-common eapim-admin-djb; do
-            rm -rf "$REPO"
-            git clone --depth=1 --branch master \
-              http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/$REPO.git \
-              "$REPO"
-          done
-
-      - name: Verify toolchain
-        run: |
-          java -version
-          gradle --version
-
-      - name: Gradle build (no tests)
-        run: gradle clean build -x test --no-daemon
-
-      - name: Upload WAR artifact
-        uses: http://172.30.1.50:3000/actions/upload-artifact@v3
-        with:
-          name: eapim-admin-war-${{ github.sha }}
-          path: eapim-admin/build/libs/eapim-admin.war
-          if-no-files-found: error
-
-      - name: Stop tomcat (pre-clean)
-        working-directory: ${{ github.workspace }}
-        run: |
-          # 1) systemd 관리 인스턴스 정지 (이번 워크플로가 띄운 것)
-          systemctl --user stop eapim-admin 2>/dev/null || true
-
-          # 2) systemd 외부 detached 인스턴스 정리
-          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"
-
-      - name: Deploy war as /monitoring
-        working-directory: ${{ github.workspace }}
-        run: |
-          DEPLOY_DIR="$CATALINA_BASE/webapps"
-          rm -rf "$DEPLOY_DIR/monitoring" "$DEPLOY_DIR/monitoring.war"
-          cp eapim-admin/build/libs/eapim-admin.war "$DEPLOY_DIR/monitoring.war"
-          ls -la "$DEPLOY_DIR"
-
-      - name: Start tomcat and readiness probe (timeout 300s)
-        working-directory: ${{ github.workspace }}
-        run: |
-          LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log"
-          BEFORE=0
-          [ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG")
-
-          # systemd 가 Tomcat 을 새 cgroup 으로 띄움 — runner step 종료와 무관하게 살아남음
-          systemctl --user start eapim-admin
-
-          # /loginForm.do 는 GET 매핑(MainController#loginForm) → tomcat·webapp 양쪽 살아있으면 200
-          # /login.do 는 POST 처리 — GET 으로 probe 시 405/잘못된 응답 가능성 있어 회피
-          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 "::error::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 "::error::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 미점유)"
-              exit 1
-              ;;
-          esac
-
-          echo "--- key boot log lines ---"
-          tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true

Jenkinsfile

@@ -1,174 +0,0 @@
-pipeline {
-  agent none
-
-  options {
-    timestamps()
-    disableConcurrentBuilds()
-    skipDefaultCheckout()   // stage별 agent의 자동 SCM checkout 방지 (Deploy 노드는 git 접근 불필요, unstash로만 WAR 수신)
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20'))
-  }
-
-  environment {
-    GIT_SSH_COMMAND = 'ssh -o StrictHostKeyChecking=accept-new'
-    WEBHOOK_URL = 'http://172.30.1.50:18000/api/hooks/01ba51b01d3c4c98ae8f3183a23a84ed713197857d024b5da4f303458195eb32'
-  }
-
-  stages {
-    stage('Build (djb-vm)') {
-      agent { label 'djb-vm' }
-      environment {
-        JAVA_HOME = '/apps/opts/jdk8'
-        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}"
-      }
-      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 -Pprofile=weblogic' }
-          post {
-            success {
-              sh '''
-                set -eu
-                cd build/libs
-                sha256sum eapim-admin.war > eapim-admin.war.sha256
-              '''
-              archiveArtifacts artifacts: 'build/libs/eapim-admin.war,build/libs/eapim-admin.war.sha256', fingerprint: true
-              stash name: 'war', includes: 'build/libs/eapim-admin.war'
-            }
-          }
-        }
-      }
-    }
-
-    stage('Deploy (weblogic)') {
-      agent { label 'weblogic' }
-      environment {
-        JENKINS_NODE_COOKIE = 'dontKillMe'          // background weblogic를 빌드 종료 시 죽이지 않게
-        WL_HOME       = '/app/eapim/adminportal'
-        WL_DEPLOY_DIR = '/app/eapim/adminportal'
-        WL_WAR_NAME   = 'eapim-admin.war'
-        WL_HTTP_PORT  = '39120'
-        WL_NOHUP      = '/logs/weblogic/domains/eapimDomain/nohup.emsSvr11.out'
-      }
-      stages {
-        stage('Stop WebLogic') {
-          steps {
-            sh '"$WL_HOME/stopEms11.sh"'            // 동기: 완전 종료까지 블록, 미기동 시에도 안전
-          }
-        }
-        stage('Deploy WAR') {
-          steps {
-            unstash 'war'
-            sh '''
-              set -eu
-              cp build/libs/eapim-admin.war "$WL_DEPLOY_DIR/$WL_WAR_NAME"
-              ls -la "$WL_DEPLOY_DIR"
-            '''
-          }
-        }
-        stage('Start WebLogic and readiness') {
-          steps {
-            sh '''
-              set -eu
-              "$WL_HOME/startEms11.sh"              # nohup & 로 백그라운드 기동, 즉시 리턴
-
-              DEADLINE=$(($(date +%s) + 300))
-              STATUS=000
-              while [ "$(date +%s)" -lt "$DEADLINE" ]; do
-                STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \
-                  "http://localhost:$WL_HTTP_PORT/monitoring/loginForm.do" 2>/dev/null || echo "000")
-                case "$STATUS" in
-                  200|302|401) echo "Readiness OK (/monitoring/loginForm.do HTTP $STATUS)"; break ;;
-                esac
-                sleep 3
-              done
-
-              case "$STATUS" in
-                200|302|401) ;;
-                *)
-                  echo "Readiness failed within 300s, last HTTP=$STATUS"
-                  [ -f "$WL_NOHUP" ] && tail -120 "$WL_NOHUP"
-                  exit 1
-                  ;;
-              esac
-            '''
-          }
-        }
-      }
-    }
-  }
-
-  post {
-    success {
-      node('weblogic') {
-        sh '''
-          set +e
-          payload=$(printf '{"text":"[%s #%s](%s) SUCCESS"}' "$JOB_NAME" "$BUILD_NUMBER" "$BUILD_URL")
-          curl -sS --fail --max-time 5 -H 'Content-Type: application/json' -X POST --data "$payload" "$WEBHOOK_URL" >/dev/null || echo "Webhook failed"
-        '''
-      }
-    }
-    failure {
-      node('weblogic') {
-        sh '''
-          set +e
-          payload=$(printf '{"text":"[%s #%s](%s) FAILURE"}' "$JOB_NAME" "$BUILD_NUMBER" "$BUILD_URL")
-          curl -sS --fail --max-time 5 -H 'Content-Type: application/json' -X POST --data "$payload" "$WEBHOOK_URL" >/dev/null || echo "Webhook failed"
-        '''
-      }
-    }
-  }
-}

WebContent/WEB-INF/applicationContext-udpip.xml

@@ -115,7 +115,7 @@
 	</bean>
 
 	<bean id="ioAcceptor" class="com.eactive.eai.rms.onl.server.UdpServer" init-method="init" destroy-method="destory">
-		<property name="port" value="39126" />
+		<property name="port" value="10800" />
 		<property name="handler" ref="handler"/>
 	</bean>
 

WebContent/WEB-INF/auditpoints.dat

@@ -12,8 +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,DELETE
+PortalPartnershipManController_사업제휴신청관리_APIGW_UNMASK
 PortalPropertyController_포탈 프로퍼티 관리_APIGW_UPDATE
-PortalUserTermsManController_약관동의 이력_APIGW_UNMASK
-MessageRequestManController_메세지발송내역_APIGW_UPDATE_STATUS
-PortalInquiryManController_Q&A문의관리_APIGW_VISIBILITY
+PortalUserTermsManController_약관동의 이력_APIGW_UNMASK

WebContent/WEB-INF/weblogic-web-app.xsd

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://xmlns.oracle.com/weblogic/weblogic-web-app"
+           xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app"
+           elementFormDefault="qualified">
+
+  <xs:element name="weblogic-web-app">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="context-root" type="xs:string" minOccurs="0"/>
+        <xs:element name="session-descriptor" minOccurs="0">
+          <xs:complexType>
+            <xs:all>
+              <xs:element name="timeout-secs" type="xs:integer" minOccurs="0"/>
+              <xs:element name="persistent-store-type" type="xs:string" minOccurs="0"/>
+            </xs:all>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="container-descriptor" minOccurs="0">
+          <xs:complexType>
+            <xs:all>
+              <xs:element name="prefer-application-packages" minOccurs="0">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="package-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="prefer-application-resources" minOccurs="0">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="resource-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:all>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>

WebContent/WEB-INF/weblogic.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app">
+<weblogic-web-app
+  xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://xmlns.oracle.com/weblogic/weblogic-web-app weblogic-web-app.xsd">
 
   <context-root>monitoring</context-root>
   <session-descriptor>
     <timeout-secs>1800</timeout-secs>
-    <cookie-name>JSESSIONID_PORTAL</cookie-name>
     <persistent-store-type>replicated_if_clustered</persistent-store-type>
   </session-descriptor>
   

WebContent/css/theme_blue.css

@@ -1,7 +1,6 @@
 @charset "utf-8";
 
 .gnb .depth1 > li:hover > a{color:#008cc5;} /* theme */
-.gnb .sitemap-link:hover{color:#008cc5;} /* theme */
 .gnb .depth1 > li > .red_box{background:#008cc5;}/* theme */
 .gnb .depth2 > li > a:hover{color:#008cc5;}/* theme */
 

WebContent/css/theme_green.css

@@ -1,7 +1,6 @@
 @charset "utf-8";
 
 .gnb .depth1 > li:hover > a{color:#16a085;} /* theme */
-.gnb .sitemap-link:hover{color:#16a085;} /* theme */
 .gnb .depth1 > li > .red_box{background:#16a085;}/* theme */
 .gnb .depth2 > li > a:hover{color:#16a085;}/* theme */
 

WebContent/css/theme_orange.css

@@ -1,7 +1,6 @@
 @charset "utf-8";
 
 .gnb .depth1 > li:hover > a{color:#e74c3c;} /* theme */
-.gnb .sitemap-link:hover{color:#e74c3c;} /* theme */
 .gnb .depth1 > li > .red_box{background:#e74c3c;}/* theme */
 .gnb .depth2 > li > a:hover{color:#e74c3c;}/* theme */
 

WebContent/css/theme_pink.css

@@ -1,7 +1,6 @@
 @charset "utf-8";
 
 .gnb .depth1 > li:hover > a{color:#ff80c0;} /* theme */
-.gnb .sitemap-link:hover{color:#ff80c0;} /* theme */
 .gnb .depth1 > li > .red_box{background:#ff80c0;}/* theme */
 .gnb .depth2 > li > a:hover{color:#ff80c0;}/* theme */
 

WebContent/css/theme_yellow.css

@@ -1,7 +1,6 @@
 @charset "utf-8";
 
 .gnb .depth1 > li:hover > a{color:#be8200;} /* theme */
-.gnb .sitemap-link:hover{color:#be8200;} /* theme */
 .gnb .depth1 > li > .red_box{background:#be8200;}/* theme */
 .gnb .depth2 > li > a:hover{color:#be8200;}/* theme */
 

WebContent/css/web_ui.css

@@ -62,8 +62,8 @@ header.sub{position:relative; padding-top:80px;}
     100% { color:rgba(255,96,78,0); }
 } */
 
-.gnb_bg{position:absolute; top:80px; left:0; display:none; width:100%; height:282px; box-sizing:border-box; background:white; box-shadow: 0px 5px 5px 0px rgba(0,0,0,0.2);}
-.gnb{position:absolute; top:0px; left:180px; display:inline-block; height:80px; overflow-y:hidden;}
+.gnb_bg{position:absolute; top:80px; left:0; display:none; width:100%; height:382px; box-sizing:border-box; background:white; box-shadow: 0px 5px 5px 0px rgba(0,0,0,0.2);}
+.gnb{position:absolute; top:0px; left:230px; display:inline-block; height:80px; overflow-y:hidden;}
 .gnb:hover{height:auto; overflow-y:visible;}
 .gnb:hover + .gnb_bg{display:block;}
 .gnb h1{float:left; display:block; width:auto; height:100%; line-height:80px;}
@@ -71,15 +71,15 @@ header.sub{position:relative; padding-top:80px;}
 
 .gnb .depth1 > li{position:relative;}
 .gnb .depth1 > li > a{position:relative; display:block; box-sizing:border-box; color:#000; font-size:14px; width:160px; height:80px; text-align:center; line-height:80px; letter-spacing:-0.5px; opacity:0.7; transition:all 0.3s;}
-.gnb .depth1 > li > a:after{content:''; position:absolute; top:34px; right:0; display:inline-block; width:1px; height:13px; }
-.gnb .depth1 > li:first-child > a:before{content:''; position:absolute; top:34px; left:0; display:inline-block; width:1px; height:13px; }
+.gnb .depth1 > li > a:after{content:''; position:absolute; top:34px; right:0; display:inline-block; width:1px; height:13px; background:#ddd;}
+.gnb .depth1 > li:first-child > a:before{content:''; position:absolute; top:34px; left:0; display:inline-block; width:1px; height:13px; background:#ddd;}
 /*
 .gnb .depth1 > li:hover .red_box{transform:scaleX(1);}
 .gnb .depth1 > li:hover > a{opacity:1;}
 .gnb .depth1 > li > .red_box{display:block; position:absolute; width:100%; height:2px; top:78px; box-sizing:border-box; background:#ed1c24; transform-origin:center center; transform:scaleX(0); transition:all 0.3s;}
 */
-.gnb .depth2{position:absolute; left:0; top:80px; width:160px; height:310px; box-sizing:border-box; padding:20px 0; border-right:1px solid #eee; text-align:center; z-index:9;}
-.gnb .depth1 > li:first-child .depth2{border-left:1px solid #eee;}
+.gnb .depth2{position:absolute; left:0; top:80px; width:160px; height:410px; box-sizing:border-box; padding:20px 0; border-right:1px solid #eee; text-align:center; z-index:9;}
+.gnb .depth2.first{border-left:1px solid #eee;}
 .gnb .depth2 > li > a{display:block; color:#000; font-size:13px; line-height:30px;}
 .gnb .depth2 > li > a:hover{color:#ff0000;}
 
@@ -94,9 +94,9 @@ header.sub{position:relative; padding-top:80px;}
 .left_box .depth3 > li:hover > a, .left_box .depth3 > li.on > a{color:#ed1c24;}
 
 .content_top{position:fixed; top:0; left:0; padding:0 30px; width:100%; height:50px; line-height:50px; background:#eee; border-top:1px solid #ddd; border-left:1px solid #ddd; z-index:100;}
-.content_top .path{margin:0; padding:0;}
-.content_top .path > li{display:inline-block; margin:0; padding:0;}
-.content_top .path > li a{display:block; height:50px; line-height:50px; padding-left:10px; font-size:12px; color:#999; text-decoration:none;}
+.content_top .path{}
+.content_top .path > li{display:inline-block;}
+.content_top .path > li a{display:block; height:50px; line-height:50px; padding-left:10px; font-size:12px; color:#999;}
 .content_top .path > li a:hover{color:#666;}
 .content_top .path > li a:before{content:'>'; margin-right:10px;}
 .content_top .path > li:first-child a:before{content:'';}

WebContent/damo.jsp

@@ -1,170 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
-<%@ page import="java.lang.reflect.Method" %>
-<%@ page import="org.apache.commons.lang3.StringUtils" %>
-<%@ page import="com.eactive.eai.rms.common.login.SessionManager" %>
-<%!
-    // 최소 HTML 이스케이프 (진단 페이지 XSS 방지)
-    private String esc(String s) {
-        if (s == null) return "";
-        StringBuilder b = new StringBuilder(s.length() + 16);
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-            switch (c) {
-                case '&':  b.append("&amp;");  break;
-                case '<':  b.append("&lt;");   break;
-                case '>':  b.append("&gt;");   break;
-                case '"':  b.append("&quot;"); break;
-                case '\'': b.append("&#39;");  break;
-                default:   b.append(c);
-            }
-        }
-        return b.toString();
-    }
-%>
-<%
-    // 로그인 사용자만 접근 — real 모드에서 운영 키 암복호화 오라클이 되지 않도록 보호
-    if (StringUtils.isBlank(SessionManager.getUserId(request))
-            && StringUtils.isBlank(SessionManager.getRoleIdString(request))) {
-        response.sendRedirect(request.getContextPath() + "/loginForm.do");
-        return;
-    }
-
-    response.setHeader("Pragma", "No-cache");
-    response.setHeader("Cache-Control", "no-cache");
-    response.setHeader("Expires", "0");
-    request.setCharacterEncoding("utf-8");
-
-    String op    = request.getParameter("op");
-    String input = request.getParameter("input");
-    boolean run  = request.getParameter("run") != null;
-    if (op == null)    op = "encrypt";
-    if (input == null) input = "";
-
-    String mode     = "UNKNOWN";
-    String revision = "-";
-    String returnCode = "-";
-    String result   = "";
-    String error    = "";
-    boolean loaded  = false;
-
-    try {
-        Class<?> cls = Class.forName("com.eactive.ext.djb.DamoManager");
-        Object damo  = cls.getMethod("getInstance").invoke(null);
-        loaded = true;
-
-        boolean bypass = (Boolean) cls.getMethod("isBypassMode").invoke(damo);
-        boolean fake   = (Boolean) cls.getMethod("isFakeMode").invoke(damo);
-        mode       = bypass ? "BYPASS" : (fake ? "FAKE" : "REAL");
-        revision   = String.valueOf(cls.getMethod("getRevision").invoke(damo));
-        returnCode = String.valueOf(cls.getMethod("getReturnCode").invoke(damo));
-
-        if (run) {
-            if ("encrypt".equals(op)) {
-                result = (String) cls.getMethod("encrypt", String.class).invoke(damo, input);
-            } else if ("decrypt".equals(op)) {
-                result = (String) cls.getMethod("decrypt", String.class).invoke(damo, input);
-            } else if ("sha256".equals(op)) {
-                int t = cls.getField("SHA256").getInt(null);
-                result = (String) cls.getMethod("hash", int.class, String.class).invoke(damo, t, input);
-            } else if ("sha512".equals(op)) {
-                int t = cls.getField("SHA512").getInt(null);
-                result = (String) cls.getMethod("hash", int.class, String.class).invoke(damo, t, input);
-            } else {
-                error = "알 수 없는 op: " + op;
-            }
-        }
-    } catch (ClassNotFoundException e) {
-        error = "com.eactive.ext.djb.DamoManager 클래스를 찾을 수 없습니다. "
-              + "damo-manager.jar 를 WAS lib (운영) 또는 WEB-INF/lib 에 배포하세요.";
-    } catch (Throwable t) {
-        // require-real fail-fast(ExceptionInInitializerError) 또는 초기화 실패(NoClassDefFoundError) 포함
-        Throwable c = (t.getCause() != null) ? t.getCause() : t;
-        error = c.toString();
-        if (c instanceof NoClassDefFoundError
-                || error.contains("require-real")
-                || error.contains("Could not initialize")) {
-            error += "  (※ -Ddamo-manager.require-real=true 인데 scpdb 가 없어 기동에 실패했을 수 있습니다. "
-                   + "scpdb 를 갖추거나 옵션을 내리세요.)";
-        }
-    }
-
-    String badgeColor = "REAL".equals(mode) ? "#1a7f37"
-                      : "BYPASS".equals(mode) ? "#9a3412"
-                      : "FAKE".equals(mode) ? "#9a6700" : "#6e7781";
-%>
-<!DOCTYPE html>
-<html lang="ko">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>DamoManager 테스트</title>
-<style>
-    body   { font-family: -apple-system, "Malgun Gothic", sans-serif; margin: 24px; color: #24292f; }
-    h1     { font-size: 20px; margin: 0 0 4px; }
-    .sub   { color: #6e7781; font-size: 13px; margin-bottom: 16px; }
-    .badge { display:inline-block; color:#fff; padding:2px 10px; border-radius:12px; font-size:12px; font-weight:600; background:<%= badgeColor %>; }
-    .meta  { font-size:12px; color:#57606a; margin-left:8px; }
-    .card  { border:1px solid #d0d7de; border-radius:8px; padding:16px; max-width:760px; }
-    label  { display:block; font-size:13px; font-weight:600; margin:12px 0 4px; }
-    textarea, select { width:100%; box-sizing:border-box; font-size:14px; padding:8px; border:1px solid #d0d7de; border-radius:6px; font-family:ui-monospace, Menlo, monospace; }
-    textarea { height:90px; resize:vertical; }
-    .row    { display:flex; gap:12px; }
-    .row > div { flex:1; }
-    button  { margin-top:14px; background:#1f6feb; color:#fff; border:0; border-radius:6px; padding:9px 18px; font-size:14px; font-weight:600; cursor:pointer; }
-    .result { margin-top:16px; }
-    .out    { background:#f6f8fa; border:1px solid #d0d7de; border-radius:6px; padding:12px; white-space:pre-wrap; word-break:break-all; font-family:ui-monospace, Menlo, monospace; font-size:13px; min-height:20px; }
-    .err    { color:#cf222e; background:#fff5f5; border-color:#ffc1c1; }
-    .hint   { font-size:12px; color:#6e7781; margin-top:18px; line-height:1.6; }
-    code    { background:#eff1f3; padding:1px 5px; border-radius:4px; }
-</style>
-</head>
-<body>
-    <h1>DamoManager 테스트</h1>
-    <div class="sub">웹에서 encrypt / decrypt / hash 동작을 즉시 확인 (eapim-admin)</div>
-
-    <div class="card">
-        <div>
-            <% if (loaded) { %>
-                <span class="badge"><%= mode %> MODE</span>
-                <span class="meta">revision=<%= esc(revision) %> · returnCode=<%= esc(returnCode) %></span>
-            <% } else { %>
-                <span class="badge" style="background:#cf222e;">NOT LOADED</span>
-                <span class="meta">damo-manager.jar 미배포</span>
-            <% } %>
-        </div>
-
-        <form method="post" action="<%= request.getContextPath() %>/damo.jsp">
-            <div class="row">
-                <div>
-                    <label for="op">동작</label>
-                    <select id="op" name="op">
-                        <option value="encrypt" <%= "encrypt".equals(op) ? "selected" : "" %>>encrypt (암호화)</option>
-                        <option value="decrypt" <%= "decrypt".equals(op) ? "selected" : "" %>>decrypt (복호화)</option>
-                        <option value="sha256"  <%= "sha256".equals(op)  ? "selected" : "" %>>hash SHA-256</option>
-                        <option value="sha512"  <%= "sha512".equals(op)  ? "selected" : "" %>>hash SHA-512</option>
-                    </select>
-                </div>
-            </div>
-
-            <label for="input">입력</label>
-            <textarea id="input" name="input" placeholder="암호화/복호화/해시할 문자열"><%= esc(input) %></textarea>
-
-            <input type="hidden" name="run" value="1">
-            <button type="submit">실행</button>
-        </form>
-
-        <% if (run || error.length() > 0) { %>
-        <div class="result">
-            <label>결과<% if (run && error.length() == 0) { %> <span class="meta">(<%= esc(op) %>)</span><% } %></label>
-            <div class="out <%= error.length() > 0 ? "err" : "" %>"><%= error.length() > 0 ? esc(error) : esc(result) %></div>
-        </div>
-        <% } %>
-
-        <div class="hint">
-            모드 의미 — <b>BYPASS</b>: 무변환 원문 통과(<b>기본값</b>, 옵션 없음) · <b>FAKE</b>: Base64/JRE 해시(<code>-Ddamo-manager.enabled=true</code>, scpdb 없음) · <b>REAL</b>: penta scpdb 실 암복호화(<code>enabled=true</code> + scpdb).<br>
-            BYPASS 모드에서는 encrypt/decrypt/hash 모두 입력을 그대로 반환합니다.<br>
-            운영은 <code>-Ddamo-manager.require-real=true</code> 로 real 강제(아니면 기동 실패). CLI 로도 동일 확인: <code>java -jar damo-manager.jar enc &lt;text&gt;</code>
-        </div>
-    </div>
-</body>
-</html>

WebContent/emergency.jsp

@@ -1,7 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=utf-8"%>
 <%@page import="org.apache.commons.lang3.StringUtils"%>
 <%@page import="com.eactive.eai.rms.common.login.SessionManager"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <!DOCTYPE html>
 <html>
   <head>

WebContent/js/djb/apispec/editor-content.css

@@ -1,334 +0,0 @@
-/**
- * Editor Content Styles (editor-content.css)
- *
- * Summernote 에디터로 작성된 HTML 콘텐츠의 공통 스타일
- * 관리자포탈/개발자포탈 양쪽에서 동일하게 사용
- *
- * 사용법:
- * - 관리자포탈: Summernote .note-editable에 .editor-content 클래스 추가
- * - 개발자포탈: 콘텐츠 wrapper에 .editor-content 클래스 추가
- *
- * @version 1.0.0
- * @date 2025-12-30
- */
-
-/* ==========================================================================
-   CSS Reset + 기본 설정
-   ========================================================================== */
-
-.editor-content {
-    all: revert;
-    font-family: 'Noto Sans KR', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif !important;
-    font-size: 16px !important;
-    font-weight: 400 !important;
-    line-height: 1.8 !important;
-    color: #1A1A2E !important;
-    word-wrap: break-word;
-    text-align: left !important;
-}
-
-/* ==========================================================================
-   헤딩 (Headings)
-   ========================================================================== */
-
-.editor-content h1 {
-    font-size: 20px !important;
-    font-weight: 700 !important;
-    margin: 32px 0 16px !important;
-    line-height: 1.4 !important;
-    color: #1A1A2E !important;
-}
-
-.editor-content h1:first-child {
-    margin-top: 0 !important;
-}
-
-.editor-content h2 {
-    font-size: 18px !important;
-    font-weight: 700 !important;
-    margin: 24px 0 8px !important;
-    line-height: 1.4 !important;
-    color: #1A1A2E !important;
-}
-
-.editor-content h3 {
-    font-size: 16px !important;
-    font-weight: 600 !important;
-    margin: 16px 0 8px !important;
-    line-height: 1.4 !important;
-    color: #1A1A2E !important;
-}
-
-.editor-content h4,
-.editor-content h5,
-.editor-content h6 {
-    font-size: 16px !important;
-    font-weight: 600 !important;
-    margin: 16px 0 8px !important;
-    line-height: 1.4 !important;
-    color: #1A1A2E !important;
-}
-
-/* ==========================================================================
-   단락 (Paragraphs)
-   ========================================================================== */
-
-.editor-content p {
-    margin-bottom: 16px !important;
-    line-height: 1.8 !important;
-    font-size: 16px !important;
-}
-
-.editor-content p:last-child {
-    margin-bottom: 0 !important;
-}
-
-/* ==========================================================================
-   리스트 (Lists) - 글로벌 reset 대응
-   ========================================================================== */
-
-.editor-content ul {
-    list-style-type: disc !important;
-    padding-left: 32px !important;
-    margin: 16px 0 !important;
-}
-
-.editor-content ol {
-    list-style-type: decimal !important;
-    padding-left: 32px !important;
-    margin: 16px 0 !important;
-}
-
-.editor-content li {
-    margin-bottom: 8px !important;
-    line-height: 1.8 !important;
-    font-size: 16px !important;
-}
-
-.editor-content li:last-child {
-    margin-bottom: 0 !important;
-}
-
-/* 중첩 리스트 */
-.editor-content ul ul {
-    list-style-type: circle !important;
-    margin: 8px 0 !important;
-}
-
-.editor-content ul ul ul {
-    list-style-type: square !important;
-}
-
-.editor-content ol ol {
-    list-style-type: lower-alpha !important;
-    margin: 8px 0 !important;
-}
-
-.editor-content ol ol ol {
-    list-style-type: lower-roman !important;
-}
-
-/* ==========================================================================
-   테이블 (Tables)
-   ========================================================================== */
-
-.editor-content table {
-    width: 100% !important;
-    border-collapse: collapse !important;
-    margin: 24px 0 !important;
-    border: 1px solid #E2E8F0 !important;
-    border-radius: 8px !important;
-    overflow: hidden !important;
-    font-size: 14px !important;
-}
-
-.editor-content th,
-.editor-content td {
-    border: 1px solid #E2E8F0 !important;
-    padding: 8px 16px !important;
-    text-align: left !important;
-    vertical-align: top !important;
-}
-
-.editor-content th {
-    background: #EFF6FF !important;
-    font-weight: 600 !important;
-    color: #1A1A2E !important;
-}
-
-.editor-content tr:hover {
-    background: #F8FAFC !important;
-}
-
-/* ==========================================================================
-   링크 (Links)
-   ========================================================================== */
-
-.editor-content a {
-    color: #0049b4 !important;
-    text-decoration: underline !important;
-    transition: color 0.3s ease !important;
-}
-
-.editor-content a:hover {
-    color: #003080 !important;
-}
-
-/* ==========================================================================
-   인용문 (Blockquote)
-   ========================================================================== */
-
-.editor-content blockquote {
-    border-left: 4px solid #0049b4 !important;
-    padding: 16px 24px !important;
-    margin: 24px 0 !important;
-    background: #F8FAFC !important;
-    font-style: italic !important;
-    color: #64748B !important;
-    border-radius: 0 8px 8px 0 !important;
-}
-
-.editor-content blockquote p {
-    margin-bottom: 0 !important;
-}
-
-/* ==========================================================================
-   이미지 (Images)
-   ========================================================================== */
-
-.editor-content img {
-    max-width: 100% !important;
-    height: auto !important;
-    border-radius: 8px !important;
-    margin: 16px 0 !important;
-    display: block !important;
-}
-
-/* ==========================================================================
-   코드 (Code)
-   ========================================================================== */
-
-.editor-content code {
-    background: #F8FAFC !important;
-    padding: 2px 6px !important;
-    border-radius: 4px !important;
-    font-family: 'Fira Code', 'Courier New', monospace !important;
-    font-size: 0.9em !important;
-    color: #0049b4 !important;
-}
-
-.editor-content pre {
-    background: #F8FAFC !important;
-    border: 1px solid #E2E8F0 !important;
-    border-radius: 8px !important;
-    padding: 16px !important;
-    overflow-x: auto !important;
-    margin: 16px 0 !important;
-}
-
-.editor-content pre code {
-    background: transparent !important;
-    padding: 0 !important;
-    color: #1A1A2E !important;
-}
-
-/* ==========================================================================
-   구분선 (Horizontal Rule)
-   ========================================================================== */
-
-.editor-content hr {
-    border: none !important;
-    border-top: 1px solid #E2E8F0 !important;
-    margin: 32px 0 !important;
-}
-
-/* ==========================================================================
-   텍스트 강조 (Text Emphasis)
-   ========================================================================== */
-
-.editor-content strong,
-.editor-content b {
-    font-weight: 700 !important;
-}
-
-.editor-content em,
-.editor-content i {
-    font-style: italic !important;
-}
-
-.editor-content u {
-    text-decoration: underline !important;
-}
-
-.editor-content s,
-.editor-content strike,
-.editor-content del {
-    text-decoration: line-through !important;
-}
-
-.editor-content mark {
-    background-color: #FEF3C7 !important;
-    padding: 0 2px !important;
-}
-
-.editor-content sub {
-    vertical-align: sub !important;
-    font-size: 0.8em !important;
-}
-
-.editor-content sup {
-    vertical-align: super !important;
-    font-size: 0.8em !important;
-}
-
-/* ==========================================================================
-   반응형 (Responsive)
-   ========================================================================== */
-
-@media (max-width: 768px) {
-    .editor-content {
-        font-size: 14px !important;
-    }
-
-    .editor-content h1 {
-        font-size: 18px !important;
-    }
-
-    .editor-content h2 {
-        font-size: 16px !important;
-    }
-
-    .editor-content h3,
-    .editor-content h4,
-    .editor-content h5,
-    .editor-content h6 {
-        font-size: 14px !important;
-    }
-
-    .editor-content p,
-    .editor-content li {
-        font-size: 14px !important;
-    }
-
-    .editor-content table {
-        font-size: 12px !important;
-    }
-
-    .editor-content th,
-    .editor-content td {
-        padding: 4px 8px !important;
-    }
-
-    .editor-content ul,
-    .editor-content ol {
-        padding-left: 24px !important;
-    }
-
-    .editor-content blockquote {
-        padding: 8px 16px !important;
-    }
-
-    .editor-content pre {
-        padding: 8px !important;
-    }
-}

WebContent/js/djb/apispec/sample-data.js

@@ -1,75 +0,0 @@
-// OpenAPI 에디터 초기 상태 골격(빈 껍데기).
-//  - specToData() 가 deepClone 하여 서버 spec 값으로 덮어쓰는 구조 기준값.
-//  - 실제 데모/샘플 값은 두지 않는다(팝업은 항상 서버 spec 로드 후 렌더).
-//  - docOptions 만 기능 기본값으로 유지(문서 미리보기 옵션).
-// locked:true = 게이트웨이 자동 주입(회색+자물쇠) / locked:false = 사용자 편집.
-
-window.SAMPLE_DATA = (function () {
-  function f() { return { value: '', locked: false }; }
-  return {
-    info: {
-      title:       f(),
-      version:     f(),
-      summary:     f(),
-      description: f(),
-      termsOfService: f(),
-      contact: { name: f(), email: f(), url: f() },
-      license: { name: f(), url: f() }
-    },
-
-    tags: [],
-
-    externalDocs: { description: f(), url: f() },
-
-    servers: [],
-
-    serverVariables: [],
-
-    operation: {
-      method:      f(),
-      path:        f(),
-      operationId: f(),
-      summary:     f(),
-      description: f(),
-      tags:        { value: [], locked: false },
-      deprecated:  { value: false, locked: false }
-    },
-
-    // 파라미터 (Path/Query/Header/Cookie)
-    parameters: [],
-
-    // Request Body 스키마
-    requestBody: {
-      mediaType: 'application/json',
-      required: { value: false, locked: false },
-      schema: []
-    },
-
-    // 응답 스키마 (상태코드 별)
-    responses: {
-      '200': { description: f(), schema: [] }
-    },
-
-    // 보안 스킴
-    securitySchemes: [],
-    globalSecurity: [],
-
-    // 예제
-    examples: {
-      request: {},
-      response: {}
-    },
-
-    // 문서 옵션
-    docOptions: {
-      theme: 'light',
-      lang: 'ko',
-      includeExamples: true,
-      tryItOut: true,
-      defaultExpandDepth: -1,
-      layout: 'BaseLayout',
-      tagFilter: [],
-      sideToc: true
-    }
-  };
-})();

WebContent/js/djb/apispec/styles.css

@@ -1,103 +0,0 @@
-/* DJB OpenAPI Editor POC — Tailwind 보강 커스텀 */
-
-html, body {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Apple SD Gothic Neo",
-               "Malgun Gothic", "Noto Sans KR", system-ui, sans-serif;
-}
-
-/* === 잠금 행/카드 좌측 띠 === */
-.locked-row td:first-child {
-  position: relative;
-}
-.locked-row td:first-child::before {
-  content: '';
-  position: absolute;
-  left: 0;
-  top: 6px;
-  bottom: 6px;
-  width: 3px;
-  background: #cbd5e1;
-  border-radius: 2px;
-}
-.locked-card {
-  position: relative;
-  background: linear-gradient(to right, #f8fafc 0%, #ffffff 4px) #ffffff;
-}
-.locked-card::before {
-  content: '';
-  position: absolute;
-  left: 0; top: 8px; bottom: 8px;
-  width: 3px;
-  background: #cbd5e1;
-  border-radius: 0 2px 2px 0;
-}
-
-/* === 스키마 테이블 — 가독성 보조 === */
-.schema-table th { white-space: nowrap; }
-.schema-table tbody tr:hover { background: #fafbfc; }
-.schema-table input,
-.schema-table select {
-  font-size: 12.5px;
-}
-.schema-table input[type="text"] {
-  padding-top: 4px;
-  padding-bottom: 4px;
-}
-
-/* === 스텝퍼 항목 hover === */
-.step-item:hover { background: #f8fafc; }
-
-/* === 미리보기 패널: Swagger UI 크기 미세조정 === */
-#preview-swagger .swagger-ui {
-  font-size: 13px;
-}
-#preview-swagger .swagger-ui .info { margin: 18px 0; }
-#preview-swagger .swagger-ui .info .title { font-size: 22px; }
-#preview-swagger .swagger-ui .scheme-container { padding: 12px 0; box-shadow: none; }
-#preview-swagger .swagger-ui .opblock { margin: 0 0 12px 0; }
-
-/* === 다크 테마 (POC 시뮬레이션 — Swagger 자체 다크는 미지원이라 컨테이너만) === */
-body.theme-dark #preview-swagger { background: #1e293b; }
-
-/* === 토스트 애니메이션 === */
-#toast { transition: opacity 0.2s; }
-
-/* === Monaco 컨테이너가 hidden 일 때 layout 깨짐 방지 === */
-#preview-monaco {
-  overflow: hidden;
-}
-
-/* === Stepper 6단 grid 셀 좌우 라인 (마지막 셀 제외) === */
-#stepper li {
-  position: relative;
-}
-#stepper li:not(:last-child)::after {
-  content: '';
-  position: absolute;
-  top: 50%;
-  right: -8px;
-  width: 16px;
-  height: 1px;
-  background: #e2e8f0;
-}
-
-/* === 보안 스킴 카드 — 잠금 표시 === */
-.locked-card {
-  background: #fafbfc;
-}
-
-/* === 칩(태그) 미세 조정 === */
-.tag-chip { transition: background 0.15s; }
-
-/* === Export menu fade === */
-#export-menu { animation: fadeIn 0.12s ease-out; }
-@keyframes fadeIn {
-  from { opacity: 0; transform: translateY(-4px); }
-  to   { opacity: 1; transform: translateY(0); }
-}
-
-/* === 1600px 기준 폼 패널 내부 가로 여유 확보 === */
-#form-content { max-width: 100%; }
-
-/* === readonly input 위에서 텍스트 커서 안 보이게 === */
-input[readonly] { user-select: text; }

WebContent/jsp/common/acl/audit/auditLogManDetail.jsp

@@ -54,18 +54,10 @@ function detail(key){
 	        $('#systemCode').val(data.systemCode);
 	        $('#logTypeText').val(data.logTypeText);
 	        $('#remoteAddress').val(data.remoteAddress);
+	        $('#logMsg').val(data.message);
 	        $('#logSubMsg').val(data.command);
 	        $('#parameters').val(data.parameters);
 
-	        // 사유(message)는 값이 있을 때만 노출
-	        if (data.message) {
-	        	$('#logMsg').val(data.message);
-	        	$('#messageRow').show();
-	        } else {
-	        	$('#logMsg').val('');
-	        	$('#messageRow').hide();
-	        }
-
 		},
 		error:function(e){
 			alert(e.responseText);
@@ -129,9 +121,6 @@ $(document).ready(function() {
 						<tr>
 							<th><%= localeMessage.getString("auditLogMan.command") %></th><td><input type="text"  id="logSubMsg" name="logSubMsg" readonly="readonly"/></td>
 						</tr>
-						<tr id="messageRow" style="display:none;">
-							<th><%= localeMessage.getString("auditLogMan.message") %></th><td><textarea  id="logMsg" name="logMsg" style="width:100%;height:80px" readonly="readonly"></textarea></td>
-						</tr>
 						<tr height="100px">
 							<th><%= localeMessage.getString("auditLogMan.parameters") %></th><td><textarea  id="parameters" name="parameters" style="width:100%;height:200px" readonly="readonly"></textarea></td>
 						</tr>

WebContent/jsp/common/acl/sitemap/sitemapMan.jsp

@@ -1,120 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=utf-8"%>
-<%@ page import="java.util.List"%>
-<%@ page import="com.eactive.eai.rms.common.acl.sitemap.ui.SitemapNode"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%!
-	private void printNodeLabel(javax.servlet.jsp.JspWriter out, SitemapNode node) throws java.io.IOException {
-		String url = node.getMenuUrl();
-		boolean hasLink = url != null && !url.trim().isEmpty() && !"NAN".equalsIgnoreCase(url.trim());
-		if (hasLink) {
-			out.print("<a href=\"javascript:void(0);\" class=\"sitemap-name\" onclick=\"goPage('"
-					+ escapeJs(url) + "','" + escapeJs(node.getMenuId()) + "');return false;\">"
-					+ escapeHtml(node.getMenuName()) + "</a>");
-		} else {
-			out.print("<span class=\"sitemap-name\">" + escapeHtml(node.getMenuName()) + "</span>");
-		}
-	}
-
-	private void printSitemapNode(javax.servlet.jsp.JspWriter out, SitemapNode node) throws java.io.IOException {
-		out.print("<li>");
-		printNodeLabel(out, node);
-
-		List<SitemapNode> children = node.getChildren();
-		if (children != null && !children.isEmpty()) {
-			out.print("<ul>");
-			for (SitemapNode child : children) {
-				printSitemapNode(out, child);
-			}
-			out.print("</ul>");
-		}
-		out.print("</li>");
-	}
-
-	private String escapeHtml(String value) {
-		if (value == null) {
-			return "";
-		}
-		return value.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;");
-	}
-
-	private String escapeJs(String value) {
-		if (value == null) {
-			return "";
-		}
-		return value.replace("\\", "\\\\").replace("'", "\\'");
-	}
-%>
-<%
-	response.setHeader("Pragma", "No-cache");
-	response.setHeader("Cache-Control", "no-cache");
-	response.setHeader("Expires", "0");
-
-	List<SitemapNode> sitemapTree = (List<SitemapNode>) request.getAttribute("sitemapTree");
-%>
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<jsp:include page="/jsp/common/include/css.jsp"/>
-<jsp:include page="/jsp/common/include/script.jsp"/>
-<style>
-	.sitemap-columns { display: flex; flex-wrap: wrap; gap: 40px; }
-	.sitemap-column { min-width: 180px; }
-	.sitemap-category { font-size: 1.1em; font-weight: bold; padding-bottom: 6px; margin-bottom: 8px; border-bottom: 2px solid #ccc; }
-	.sitemap-tree, .sitemap-tree ul { list-style-type: disc; margin: 0; padding-left: 18px; }
-	.sitemap-tree { padding-left: 0; list-style-type: none; }
-	.sitemap-tree li { line-height: 1.8; }
-	a.sitemap-name { text-decoration: none; cursor: pointer; }
-	a.sitemap-name:hover { text-decoration: underline; }
-</style>
-<script language="javascript">
-	function goPage(url, menuId) {
-		var serviceType = sessionStorage["serviceType"];
-
-		var pageUrl = url;
-		pageUrl += (pageUrl.indexOf("?") > -1 ? "&" : "?") + "menuId=" + menuId;
-		pageUrl += "&serviceType=" + serviceType;
-
-		parent.leftFrame.location.href = '<c:url value="/leftMenu.do"/>?menuId=' + menuId + '&serviceType=' + serviceType;
-		location.href = pageUrl;
-	}
-</script>
-</head>
-	<body>
-		<div class="right_box">
-			<div class="content_top">
-				<ul class="path">
-					<li><a href="#">${rmsMenuPath}</a></li>
-				</ul>
-			</div><!-- end content_top -->
-			<div class="content_middle">
-				<!-- <div class="title">사이트맵</div> -->
-				<div class="sitemap-columns">
-<%
-	for (SitemapNode category : sitemapTree) {
-%>
-					<div class="sitemap-column">
-						<div class="sitemap-category">
-<%
-		printNodeLabel(out, category);
-%>
-						</div>
-						<ul class="sitemap-tree">
-<%
-		List<SitemapNode> children = category.getChildren();
-		if (children != null) {
-			for (SitemapNode child : children) {
-				printSitemapNode(out, child);
-			}
-		}
-%>
-						</ul>
-					</div>
-<%
-	}
-%>
-				</div>
-			</div><!-- end content_middle -->
-		</div><!-- end right_box -->
-	</body>
-</html>

WebContent/jsp/common/include/script.jsp

@@ -531,88 +531,6 @@
             }
         }, 200);
     }
-
-    /**
-     * 사유 입력 모달 - 확인 시 입력한 사유 문자열을 onConfirm(reason)으로 전달
-     * @param {string} message - 안내 메시지
-     * @param {object} options - (title, confirmText, cancelText, placeholder, required, onConfirm, onCancel)
-     *                           required 기본 true (빈 사유 차단)
-     */
-    function showReasonPrompt(message, options) {
-        options = options || {};
-        var title = options.title || '사유 입력';
-        var confirmText = options.confirmText || '확인';
-        var cancelText = options.cancelText || '취소';
-        var placeholder = options.placeholder || '사유를 입력하세요.';
-        var required = options.required !== false;
-        var onConfirm = options.onConfirm || function(){};
-        var onCancel = options.onCancel || function(){};
-
-        // 기존 모달 제거
-        $('#commonReasonModal').remove();
-
-        var iconHtml = getAlertIcon('warning');
-
-        var modalHtml =
-            '<div id="commonReasonModal" class="common-alert-overlay">' +
-                '<div class="common-alert-modal alert-warning">' +
-                    '<div class="common-alert-header">' +
-                        '<span class="common-alert-icon">' + iconHtml + '</span>' +
-                        '<span class="common-alert-title">' + title + '</span>' +
-                    '</div>' +
-                    '<div class="common-alert-body">' +
-                        '<p class="common-alert-message">' + message + '</p>' +
-                        '<textarea id="commonReasonInput" maxlength="200" placeholder="' + placeholder + '" style="width:100%;height:80px;margin-top:10px;box-sizing:border-box;font-size:13px;padding:8px;border:1px solid #ddd;border-radius:4px;resize:vertical;"></textarea>' +
-                        '<p id="commonReasonError" style="display:none;color:#f44336;font-size:12px;margin:6px 0 0;">사유를 입력해 주세요.</p>' +
-                    '</div>' +
-                    '<div class="common-alert-footer">' +
-                        '<button type="button" class="common-confirm-cancel-btn" id="commonReasonCancelBtn">' + cancelText + '</button>' +
-                        '<button type="button" class="common-alert-btn" id="commonReasonOkBtn">' + confirmText + '</button>' +
-                    '</div>' +
-                '</div>' +
-            '</div>';
-
-        $('body').append(modalHtml);
-
-        setTimeout(function() {
-            $('#commonReasonModal').addClass('show');
-            $('#commonReasonInput').focus();
-        }, 10);
-
-        // 확인 버튼
-        $('#commonReasonOkBtn').on('click', function() {
-            var reason = $.trim($('#commonReasonInput').val());
-            if (required && reason === '') {
-                $('#commonReasonError').show();
-                $('#commonReasonInput').focus();
-                return;
-            }
-            closeCommonReason(function() { onConfirm(reason); });
-        });
-
-        // 취소 버튼
-        $('#commonReasonCancelBtn').on('click', function() {
-            closeCommonReason(onCancel);
-        });
-
-        // ESC 키로 취소
-        $(document).on('keydown.commonReason', function(e) {
-            if (e.keyCode === 27) {
-                closeCommonReason(onCancel);
-            }
-        });
-    }
-
-    function closeCommonReason(callback) {
-        $('#commonReasonModal').removeClass('show');
-        setTimeout(function() {
-            $('#commonReasonModal').remove();
-            $(document).off('keydown.commonReason');
-            if (typeof callback === 'function') {
-                callback();
-            }
-        }, 200);
-    }
 </script>
 
 <!-- 공용 Alert 모달 스타일 -->

WebContent/jsp/common/screen/emergency.jsp

@@ -91,10 +91,7 @@
 				data: $('#loginForm').serialize(),
 				dataType: 'json',
 				success: function(response) {
-					if (response.changePassword) {
-						showChangeInitPassword(response);
-					}
-					else if (response.smsAuthRequired) {
+					if (response.smsAuthRequired) {
 						// SMS 인증 필요
 						showSmsAuthModal(response);
 					} else if (response.success) {
@@ -111,13 +108,6 @@
 				}
 			});
 		}
-		
-		function showChangeInitPassword(data) {
-			$('input[name="resetUserId"]').val($('input[name="userId"]').val());
-			$('input[name="resetPassword"]').val($('input[name="password"]').val());
-			$('#changeInitPassword').hide();
-			$('#pwdChgModal').modal('show');
-		}
 
 		// SMS 인증 모달 표시
 		function showSmsAuthModal(data) {
@@ -228,39 +218,44 @@
 			clearInterval(resendTimer);
 			$('#smsAuthModal').modal('hide');
 		}
-		
-		function checkPwd(){
+		function changePwd(){
 			if ($("input[name=resetUserId]").val() == null || $("input[name=resetUserId]").val().length == 0 ){
 				alert("<%= localeMessage.getString("login.checkid") %>");
 				$("input[name=resetUserId]").trigger("focus");
-				return false;
+				return;
 			}
 			if ($("input[name=resetPassword]").val() == null || $("input[name=resetPassword]").val().trim().length == 0 ){
 				alert("<%= localeMessage.getString("login.checkpwd1") %>");
 				$("input[name=resetPassword]").trigger("focus");
-				return false;
+				return;
 			}
 			if ($("input[name=changePassword]").val() == null || $("input[name=changePassword]").val().trim().length == 0 ){
 				alert("<%= localeMessage.getString("login.checkpwd2") %>");
 				$("input[name=changePassword]").trigger("focus");
-				return false;
+				return ;
 			}
 			if ($("input[name=confirmPassword]").val() == null || $("input[name=confirmPassword]").val().trim().length == 0 ){
 				alert("<%= localeMessage.getString("login.checkpwd3") %>");
-				return false;
+				return ;
 			}
-			if ($("input[name=changePassword]").val() != $("input[name=confirmPassword]").val()){
+			if ($("input[name=confirmPassword]").val() != $("input[name=confirmPassword]").val()){
 				alert("<%= localeMessage.getString("login.checkpwd4") %>");
 				$("input[name=confirmPassword]").trigger("focus");
-				return false;
+				return ;
 			}
 			if ($("input[name=resetUserId]").val() == $("input[name=changePassword]").val()){
 				alert("<%= localeMessage.getString("login.checkpwd5") %>");
 				$("input[name=changePassword]").trigger("focus");
-				return false;
+				return ;
 			}
 
-			return true;
+			//if (idCheck.checked){
+			//		setCookie("key",id);
+			//}
+			<%--   $("form").attr("action","<c:url value="/changePassword.do"/>");
+              //$("form").action = "<%=request.getContextPath()%>/changePassword.do";
+              --%>
+			$("form").submit();
 		}
 		
 		$(document).ready(function() {
@@ -276,22 +271,14 @@
 			});
 			$("input[name=changePassword]").keydown(function(event){
 				if ( event.which == 13 ) {
-					$('#modalLoginForm').submit();
+					changePwd();
 				}
 			});
 			$("input[name=confirmPassword]").keydown(function(event){
 				if ( event.which == 13 ) {
-					$('#modalLoginForm').submit();
+					changePwd();
 				}
 			});
-			// Password Change 링크로 직접 열 때만 초기화 (JS에서 modal('show') 호출 시 relatedTarget 없음)
-			$('#pwdChgModal').on('show.bs.modal', function(event) {
-				if (event.relatedTarget) {
-					$('#modalLoginForm')[0].reset();
-					$('#changeInitPassword').show();
-				}
-			});
-
 			$("select[name=serviceType]").change(function(){
 				fncPreMain();
 			});
@@ -299,7 +286,9 @@
 			$("#btn_login").click(function(){
 				fncPreMain();
 			});
-			
+			$("#changePwd").click(function(){
+				changePwd();
+			});
 			$("#btn_sso_login").click(function(){
 				fncSsoLogin();
 			});
@@ -364,10 +353,10 @@
 					</div>
 					<!-- SSO 로그인 버튼 (비상모드 시 숨김) -->
 					<c:if test="${not emergencyMode}">
-					<!-- <div class="form-group">
+					<div class="form-group">
 						<input type="button" id="btn_sso_login" class="form-control btn btn-success rounded submit px-3"
 							   value="SSO Login">
-					</div> -->
+					</div>
 					</c:if>
 					<p style="color:red;"><%=resultMsg %></p>
 				</form>
@@ -377,7 +366,7 @@
 	</div>
 </div>
 
-<!-- 비밀번호 변경 모달 -->
+
 <div class="modal fade" id="pwdChgModal" tabindex="-1" role="dialog" aria-labelledby="pwdChgModalLabel" aria-hidden="true">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
@@ -387,15 +376,13 @@
 					<span aria-hidden="true">X</span>
 				</button>
 			</div>
-			<form  id="modalLoginForm" action="<c:url value="/changePassword.do"/>" method="post" onsubmit="return checkPwd()" novalidate>
+			<form name="form" id="modalLoginForm" action="<c:url value="/changePassword.do"/>" method="post">
 				<div class="modal-body">
-					<div id="changeInitPassword">
-						<div class="form-group d-flex">
-							<input type="text" name="resetUserId" class="form-control rounded-left" placeholder="User Id" required>
-						</div>
-						<div class="form-group d-flex">
-							<input type="password" name="resetPassword" class="form-control rounded-left" placeholder="<%= localeMessage.getString("login.placeholderCurrentPassword") %>" autocomplete="off" required>
-						</div>
+					<div class="form-group d-flex">
+						<input type="text" name="resetUserId" class="form-control rounded-left" placeholder="User Id" required>
+					</div>
+					<div class="form-group d-flex">
+						<input type="password" name="resetPassword" class="form-control rounded-left" placeholder="<%= localeMessage.getString("login.placeholderCurrentPassword") %>" autocomplete="off" required>
 					</div>
 					<p><%= localeMessage.getString("login.toChangePasswordMessage") %></p>
 					<div class="form-group d-flex">
@@ -404,12 +391,9 @@
 					<div class="form-group d-flex">
 						<input type="password" name="confirmPassword" class="form-control rounded-left" placeholder="<%= localeMessage.getString("login.placeholderConfirmationPassword") %>" autocomplete="off" required>
 					</div>
-					<span style="font-size:0.8em; color:red">
-						※ 7글자 이상 & 영문/숫자/특수문자 2종류 이상
-					</span>
 				</div>
 				<div class="modal-footer">
-					<button type="submit" id="changePwd" class="form-control btn btn-primary rounded submit px-3">변경</button>
+					<input type="button" id ="changePwd" class="form-control btn btn-primary rounded submit px-3" value="변경">
 				</div>
 			</form>
 		</div>

WebContent/jsp/common/screen/main.jsp

@@ -52,13 +52,6 @@
 	var urlParam = window.document.location.search;
 	var mod		 = "";
 	var strServiceType = "<%=request.getParameter("serviceType")%>";
-	function getServiceType() {
-		var serviceType = sessionStorage.getItem("serviceType");
-		if (!serviceType || serviceType == "undefined" || serviceType == "null") {
-			serviceType = localStorage.getItem("serviceType") || "";
-		}
-		return serviceType;
-	}
 	if(urlParam != ""){
  		if(urlParam.indexOf("mod=") > -1){
  			mod = urlParam.substring((urlParam.indexOf("mod=") + 4), urlParam.lastIndexOf("&"));
@@ -74,18 +67,15 @@
 		}
 	}   	
 
-	$(document).ready(function() {
+	$(document).ready(function() { 
     	var url = '<%=topPage%>';
-   		var serviceType = getServiceType();
-   		if (serviceType) {
-   			if (url.indexOf("?")>=0){
-   				url = url + "&serviceType="+ serviceType;
-   			}else{
-   				url = url + "?serviceType="+ serviceType;
-   			}
+   		if (url.indexOf("?")>=0){
+   			url = url + "&serviceType="+ sessionStorage["serviceType"];
+   		}else{
+   			url = url + "?serviceType="+ sessionStorage["serviceType"];
    		}
-
-   		$("#topFrame").attr('src',url);
+   		
+   		$("#topFrame").attr('src',url); 
    		
 	 	$(".topMenu").load(function(){    // iframe이 모두 load된후 제어
 				$(".topMenu").contents().find('.gnb').on("mouseenter", function(e){

WebContent/jsp/common/screen/top_04.jsp

@@ -9,8 +9,6 @@
 <%@page import="com.eactive.eai.rms.common.util.StringUtils" %>
 <%@page import="com.eactive.eai.rms.common.datasource.DataSourceType" %>
 <%@page import="com.eactive.eai.rms.common.datasource.DataSourceTypeManager" %>
-<%@page import="com.eactive.eai.common.util.ApplicationContextProvider" %>
-<%@page import="com.eactive.eai.rms.data.entity.man.role.RoleMenuAuthService" %>
 <%@ 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" %>
@@ -18,12 +16,6 @@
 <%
     String serviceKey = SessionManager.getServiceTypeKey(request);
     String serviceText = DataSourceTypeManager.getDataSourceType(serviceKey).getText();
-
-    final String SITEMAP_MENU_ID = "0510013";
-    RoleMenuAuthService roleMenuAuthService = ApplicationContextProvider.getContext().getBean(RoleMenuAuthService.class);
-    String sitemapMenuAuth = roleMenuAuthService.getRoleList(SessionManager.getUserId(request), SITEMAP_MENU_ID, serviceKey);
-    boolean showSitemapLink = "R".equals(sitemapMenuAuth) || "W".equals(sitemapMenuAuth);
-
     String roleScreenId = (String) request.getAttribute("roleScreenId");
     String mainPage = (String) request.getAttribute("mainPage");
     String menuId = (String) request.getAttribute("menuId");
@@ -248,12 +240,6 @@
 
     <link rel="stylesheet" type="text/css" media="screen" href="<c:url value="/css/web_ui.css"/>"/>
     <link rel="stylesheet" type="text/css" media="screen" href="<c:url value="/css/theme_${themeColor}.css"/>"/>
-    <style>
-        .topmenu_box .sitemap-link { display: inline-block; width: 80px; height: 80px; line-height: 80px; box-sizing: border-box; font-size: 14px; color: #666; text-align: center;  	 opacity: 0.7; transition: all 0.3s; margin-top: 0px; }
-        .topmenu_box .sitemap-link:hover { opacity: 1; }
-        .topmenu_box .logout-link { line-height: 80px; margin-top:0; }
-        .topmenu_box > ul li:last-child > a:before { display: none; }
-    </style>
     <script language="javascript" src="<c:url value="/js/jquery-1.12.1.min.js"/>"></script>
     <script language="javascript" src="<c:url value="/js/prefixfree.min.js"/>"></script>
     <script language="javascript" src="<c:url value="/js/jquery.cookie.js"/>"></script>
@@ -317,11 +303,11 @@
         }
 
         //왼쪽메뉴, 메인 페이지 이동
-        function goPage2(page1, page2, page2_id) {
+        function goPage2(page1, page2, page2_id) {        	
             parent.leftFrame.location.href = goNavUrl(page1);
             parent.mainFrame.location.href = goNavUrl(page2);
         }
-
+        
         var sessionAjax = createAjaxRequest();
 
         function getAjaxData() {
@@ -543,7 +529,6 @@
                 console.log("selectLocaleValue : " + selectLocaleValue);
                 parent.changeLocale($(this).val());
             });
-
         });
         
 		$(function() {
@@ -566,28 +551,21 @@
         </h1><!--  /monitoring/images/top_logo.png -->
         <div class="topmenu_box">
             <ul>
-                <li style="width:240px;" id="newDashboardShow">		
+                <li style="width:240px;" id="newDashboardShow">
                     <a style="width:240px;"
-                       href="#"><span><%=SessionManager.getUserName(request) %>(<%=SessionManager.getUserId(request) %>-<%=System.getProperty("inst.Name") %>)</span>
+                       href="#"><span><%=SessionManager.getUserName(request) %>(<%=SessionManager.getUserId(request) %>)</span>
                         <span onClick="javascript:openColorPopup();"><%=localeMessage.getString("screen.customer") %></span>
                         <% if (!"".equals(LastLoginYms.trim())) { %>
                         <span style="display:block;font-size:10px;"><%=localeMessage.getString("screen.lastLogin") %> : <%=LastLoginYms%> [ <%=LastLoginIp%> ]</span>
                         <% } %>
                     </a></li>
-                <li style="width:100px; line-height:80px; text-align:center;">
-                    <select id="selectLocale" name="locale" style="width:60px; padding: 2px; text-align:center;">
+                <li>
+                    <select id="selectLocale" name="locale" style="margin-top: 20px; width:80px">
                         <option value="en">English</option>
                         <option value="ko">한글</option>
                     </select>
                 </li>
-                <% if (showSitemapLink) { %>
-                <li>
-                	<a href="<c:url value="/common/acl/sitemap/sitemapMan.view"><c:param name="menuId" value="<%=SITEMAP_MENU_ID%>"/><c:param name="serviceType" value="<%=serviceKey%>"/></c:url>" target="mainFrame" class="sitemap-link">
-                		<%= localeMessage.getString("screen.sitemap") %>
-                	</a>
-                </li>
-                <% } %>
-                <li onclick="logout()"><a href="#" class="logout-link"><img src="<c:url value="/img/icon_logout.png"/>"
+                <li onclick="logout()"><a href="#" class=""><img src="<c:url value="/img/icon_logout.png"/>"
                                                                  alt=""/><%= localeMessage.getString("screen.logout") %>
                 </a></li>
             </ul>

WebContent/jsp/js/stringMaskingUtil.js

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

WebContent/jsp/onl/admin/authserver/scopeManDetail.jsp

@@ -19,6 +19,7 @@
 var url      = '<c:url value="/onl/admin/authserver/scopeMan.json" />';
 var url_view = '<c:url value="/onl/admin/authserver/scopeMan.view" />';
 var api_url_view = '<c:url value="/onl/apim/apigroup/apiGroupMan.view" />';
+var mapping_url      = '<c:url value="/onl/admin/authserver/apiScopeMan.json" />';
 
 var isDetail = false;
 function isValid(){
@@ -64,9 +65,9 @@ function mappingInfo(key){
 
     $.ajax({
         type : "POST",
-        url: url,
+        url: mapping_url,
         dataType: "json",
-        data: {cmd: 'API_LIST', searchScopeId : key},
+        data: {cmd: 'LIST', searchScopeId : key},
         success: function(json){
             var mappingData = json.rows; 
 
@@ -130,6 +131,45 @@ function init(key, callback){
 	}
 }
 
+function saveApiGridData(scopeId, returnUrl) {
+	var postData = [];
+	var rows = $("#selectedApiGrid").jqGrid('getRowData');
+	
+	$.each(rows, function(index, item) {
+        item.scopeId = scopeId; 
+    });
+
+    postData.push({
+        name: "apiList",
+        value: JSON.stringify(rows)
+    });
+
+    postData.push({ name: "cmd" , value:"INSERT_APILIST" });
+    postData.push({ name: "scopeId" , value:scopeId });
+    
+	$.ajax({
+		type : "POST",
+		url:mapping_url,
+		data: postData,
+        beforeSend: function() {
+        	$("[id^='btn_']").prop("disabled", true);
+        	$("#btn_modify").text("처리중 . . . . .");
+        },
+		success:function(args){
+			alert("저장 되었습니다.");
+
+			goNav(returnUrl);//LIST로 이동
+		},
+		error:function(e){
+			alert(e.responseText);
+		},
+        complete: function() {
+        	$("[id^='btn_']").prop("disabled", false);
+			$("#btn_modify").text("수정");
+        }
+	});
+}
+
 $(document).ready(function() {
 	var returnUrl = getReturnUrlForReturn();
 	var key ="${param.scopeId}";
@@ -142,39 +182,28 @@ $(document).ready(function() {
 		if (!isValid()){
 			return;
 		}
-		var scopeId = $('input[name=scopeId]').val();
 		var postData = $('#ajaxForm').serializeArray();
-
-		var rows = $("#selectedApiGrid").jqGrid('getRowData');
-		$.each(rows, function(index, item) {
-			item.scopeId = scopeId;
-		});
-		postData.push({ name: "apiList" , value: JSON.stringify(rows) });
-
 		if (isDetail){
 			postData.push({ name: "cmd" , value:"UPDATE"});
 		}else{
 			postData.push({ name: "cmd" , value:"INSERT"});
 		}
-
 		$.ajax({
 			type : "POST",
 			url:url,
 			data:postData,
-			beforeSend: function() {
-				$("[id^='btn_']").prop("disabled", true);
-				$("#btn_modify").text("처리중 . . . . .");
-			},
 			success:function(args){
-				alert("저장 되었습니다.");
-				goNav(returnUrl);//LIST로 이동
+				alert("SCOPE 정보가 저장 되었습니다. 이어서 API 리스트를 저장합니다.");
+
+				if(!isDetail) { // INSERT 일 경우 ScopeId를 업데이트
+					key = $('input[name=scopeId]').val();
+				}
+				saveApiGridData(key, returnUrl); // API LIST 저장.
+
+				
 			},
 			error:function(e){
 				alert(e.responseText);
-			},
-			complete: function() {
-				$("[id^='btn_']").prop("disabled", false);
-				$("#btn_modify").text("수정");
 			}
 		});
 	});

WebContent/jsp/onl/admin/common/propertyManDetail.jsp

@@ -250,29 +250,6 @@ var url_view = '<c:url value="/onl/admin/common/propertyMan.view" />';
 			});
 
 		});
-		
-		$("#btn_pop_encrypt").click(function() {
-			var prpty2Val = $("input[name=prpty2Val]").val();
-			if (prpty2Val == '') {
-				alert("프라퍼티 값을 입력하세요");
-				return;
-			}
-			var postData = {
-					cmd : "ENCRYPT",
-					prpty2Val : prpty2Val,
-			};
-			$.ajax({
-				type : "POST",
-				url : url,
-				data : postData,
-				success : function(args) {
-					$("input[name=prpty2Val]").val(args);
-				},
-				error : function(e) {
-					alert(e.responseText);
-				}
-			});
-		});
 
 		buttonControl(key);
 		titleControl(key);
@@ -312,17 +289,12 @@ var url_view = '<c:url value="/onl/admin/common/propertyMan.view" />';
 				<table class="table_row" cellspacing="0">
 					<tr>
 						<th style="width:20%;"><%= localeMessage.getString("propertyDetail.propertyKey") %></th>
-						<td>
-							<input type="text" name="prptyName" style="width:calc(100% - 85px);" /> <!-- <img src="<c:url value="/img/btn_pop_input.png"/>" id="btn_pop_input" /></td> -->			
-							<button type="button" class="cssbtn smallBtn2" id="btn_pop_input" style="vertical-align:middle; font-weight:bold;"><i class="material-icons">input</i><%= localeMessage.getString("button.input") %></button>
-						</td>
+						<td><input type="text" name="prptyName" style="width:calc(100% - 85px);" /> <!-- <img src="<c:url value="/img/btn_pop_input.png"/>" id="btn_pop_input" /></td> -->			
+						<button type="button" class="cssbtn smallBtn2" id="btn_pop_input" style="vertical-align:middle; font-weight:bold;"><i class="material-icons">input</i><%= localeMessage.getString("button.input") %></button>
 					</tr>
 					<tr>
-						<th style="width:20%;"><%= localeMessage.getString("propertyDetail.propertyValue") %></th>
-						<td>
-							<input type="text" name="prpty2Val" style="width:calc(100% - 85px);"/>
-							<button type="button" class="cssbtn smallBtn2" id="btn_pop_encrypt" style="vertical-align:middle; font-weight:bold;"><i class="material-icons">lock</i><%= localeMessage.getString("button.encode") %></button>
-						</td>
+						<th><%= localeMessage.getString("propertyDetail.propertyValue") %></th>
+						<td><input type="text" name="prpty2Val"/></td>
 					</tr>
 				</table>
 				<!-- grid -->

WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp

@@ -298,7 +298,6 @@ $(document).ready(function() {
 					url: url,
 					data: postData,
 					success: function(args) {
-						console.log('mod', args);
 						showAlert("<%= localeMessage.getString("common.saveMsg") %>", {
 							type: 'success',
 							title: '저장 완료',
@@ -494,6 +493,11 @@ $(document).ready(function() {
 								<span class="bucket-summary-value" id="summaryThreshold">0<span class="unit">req</span></span>
 								<span class="bucket-summary-sub" id="summaryThresholdCalc"></span>
 							</div>
+							<div class="bucket-summary-item">
+								<span class="bucket-summary-label">적용 API</span>
+								<span class="bucket-summary-value" id="summaryActiveApi">0<span class="unit">개</span></span>
+								<span class="bucket-summary-sub" id="summaryActiveApiList"></span>
+							</div>
 						</div>
 					</div>
 

WebContent/jsp/onl/admin/rule/layoutManDetail.jsp

@@ -34,7 +34,7 @@
             , {id:'LLLVAR',name:'[ISO8583] LLLVAR'}, {id:'LLLLVAR',name:'[ISO8583] LLLLVAR'}, {id:'BINARY',name:'[ISO8583] BINARY'}, {id:'LLBIN',name:'[ISO8583] LLBIN'}
             , {id:'LLLBIN',name:'[ISO8583] LLLBIN'}];
 
-        const basicDataTypes = [{id:'BigDecimal',name:'BigDecimal'},{id:'String',name:'String'},{id:'Boolean',name:'Boolean'}];
+        const basicDataTypes = [{id:'BigDecimal',name:'BigDecimal'},{id:'String',name:'String'}];
 
         function gridRenderingInit() {
             $('#effectGrid').jqGrid({
@@ -71,11 +71,11 @@
 
             $('#grid').children().remove();
 
-            const itemTypes = ['Field', 'Grid', 'Group', 'Attr', 'Array'];
+            const itemTypes = ['Field', 'Grid', 'Group', 'Attr'];
 
             columns = [ // for columnData prop
-                { title: '<%= localeMessage.getString("layoutMan.itemDesc") %>', name: 'loutItemDesc', type: 'text', width:280, resize:true, minWidth:120 },
                 { title: '<%= localeMessage.getString("layoutMan.itmeEn") %>', name: 'loutItemName', type: 'text', width:280, resize:true, minWidth:120 },
+                { title: '<%= localeMessage.getString("layoutMan.itemDesc") %>', name: 'loutItemDesc', type: 'text', width:280, resize:true, minWidth:120 },
                 { title: '<%=localeMessage.getString("standardLayout.itemLevel")%>', name: 'loutItemDepth', type: 'text', width:50 },
                 { title: '<%= localeMessage.getString("standardLayout.itemType") %>', name: 'loutItemType', type: 'autocomplete', source: itemTypes, width:70 },
                 { title: '<%= localeMessage.getString("standardLayout.arraySize") %>', name: 'loutItemOccCnt', type: 'text', width:90 },

WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp

@@ -54,7 +54,6 @@
 		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;
 
@@ -551,14 +550,6 @@
 			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() == '') {
@@ -898,10 +889,10 @@
 				let selectValue = "";
 				let targetValue = "";
 				for ( var i = 0; i < sourceData.length; i++) {
-					if (sourceData[i]['loutItemType'] != "Field" && sourceData[i]['loutItemType'] != "Attr" && sourceData[i]['loutItemType'] != "Array") continue;
+					if (sourceData[i]['loutItemType'] != "Field" && sourceData[i]['loutItemType'] != "Attr") continue;
 					selectValue = (sourceData[i]['LOUTITEMPATH']).substr(sourceData[i]['loutName'].length+1);
 					for (var j = 0; j <targetData.length; j++) {
-						if (targetData[j]['loutItemType'] != "Field" && targetData[j]['loutItemType'] != "Attr" && targetData[j]['loutItemType'] != "Array") continue;
+						if (targetData[j]['loutItemType'] != "Field" && targetData[j]['loutItemType'] != "Attr") continue;
 						targetValue = (targetData[j]['LOUTITEMPATH']).substr(targetData[j]['loutName'].length+1);
 						if (targetValue == selectValue ) {
 							var data = sourceData[i]['LOUTITEMPATH'];
@@ -925,8 +916,8 @@
 				//field, ATTR 여부 판단
 				var sourceRow = sourceGrid.getRowData( srcRowId );
 				var targetRow = targetGrid.getRowData( tgtRowId );
-				if ( (sourceRow["loutItemType"] == 'Field' || sourceRow["loutItemType"] == 'Attr' || sourceRow["loutItemType"] == 'Array') &&
-						(targetRow["loutItemType"] == 'Field' || targetRow["loutItemType"] == 'Attr' || targetRow["loutItemType"] == 'Array')  ){
+				if ( (sourceRow["loutItemType"] == 'Field' || sourceRow["loutItemType"] == 'Attr') &&
+						(targetRow["loutItemType"] == 'Field' || targetRow["loutItemType"] == 'Attr')  ){
 					;
 				}else{
 					alert('<%=localeMessage.getString("transformManDetail.alert3")%>');
@@ -945,15 +936,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 && sourceData[i]['loutItemType'] != LAYOUT_ITEM_TYPE_ARRAY) continue;
+					if (sourceData[i]['loutItemType'] != LAYOUT_ITEM_TYPE_FIELD) continue;
 					j++;
-					while (targetData.length -1 >= j && targetData[j]["loutItemType"] != LAYOUT_ITEM_TYPE_FIELD && targetData[j]["loutItemType"] != LAYOUT_ITEM_TYPE_ARRAY){
+					while (targetData.length -1 >= j &&targetData[j]["loutItemType"] != LAYOUT_ITEM_TYPE_FIELD){
 						j++;
 					}
 					if (targetData.length -1 < j) break;
 					var targetRowId = targetData[j]['id'];
-					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,'CNVSNCMDNAME',addGroupTag(srcGroup,sourceData[i]['LOUTITEMPATH']));
+					targetGrid.jqGrid('setCell',targetRowId,'CNVSNRSULTITEMPATHNAME',addGroupTag(tgtGroup,targetData[j]['LOUTITEMPATH']));
 					targetGrid.jqGrid('setCell',targetRowId,'CNVSNITEMSERNO',targetData[j]['loutItemSerno']);
 
 					const sourceEndpointElementId = sourceGrid.getEndpointElementId(sourceData[i]['id']);
@@ -1024,7 +1015,7 @@
 				var targetData = targetGrid.getRowData();
 				var gridData                = new Array();
 				for (var i = 0; i <targetData.length; i++) {
-					if ((targetData[i]['loutItemType'] != "Field") && (targetData[i]['loutItemType'] != "Attr") && (targetData[i]['loutItemType'] != "Array")) {
+					if ((targetData[i]['loutItemType'] != "Field") && (targetData[i]['loutItemType'] != "Attr")) {
 						continue;
 					}
 					if (targetData[i]['CNVSNCMDNAME']==null
@@ -1167,7 +1158,7 @@
 		function srcformatterFunction(cellvalue,options,rowObject){
 			var rowId = options["rowId"];
 			var loutItemType = rowObject["loutItemType"];
-			if (loutItemType == 'Field' || loutItemType == 'Attr' || loutItemType == 'Array'){
+			if (loutItemType == 'Field' || loutItemType == 'Attr'){
 				return "<div id='div_src_"+rowId+"' name='src_"+rowId+"' style='width:28px;height:17px;background-color: #D12F35; border-color: #ab1717; border-style: solid; border-width: 1px; border-radius: 3px;' />";
 			}else{
 				return "<div id='div_srcgroup_"+rowId+"' name='srcgroup_"+rowId+"' style='width:28px;height:17px;' />";
@@ -1179,7 +1170,7 @@
 		function tgtformatterFunction(cellvalue,options,rowObject){
 			var rowId = options["rowId"];
 			var loutItemType = rowObject["loutItemType"];
-			if (loutItemType == 'Field' || loutItemType == 'Attr' || loutItemType == 'Array'){
+			if (loutItemType == 'Field' || loutItemType == 'Attr'){
 				return "<div id='div_tgt_"+rowId+"_base' name='div_tgt_"+rowId+"_base' style='width:30px;height:20px; background-color:gray;' >"
 						+ "<div id='div_tgt_"+rowId+"' name='tgt_"+rowId+"' style='width:28px;height:17px; background-color: #3E7E9C;  border-color: #217ca7; border-style: solid; border-width: 1px; border-radius: 3px;' onclick='jqGridOnTargetGridEndpointClick(this)'>"
 						+ "</div></div>";
@@ -1678,8 +1669,8 @@
 				return;
 			}
 
-			if ((sourceRow["loutItemType"] != 'Field' && sourceRow["loutItemType"] != 'Attr' && sourceRow["loutItemType"] != 'Array')
-					|| (targetRow["loutItemType"] != 'Field' && targetRow["loutItemType"] != 'Attr' && targetRow["loutItemType"] != 'Array')) {
+			if ((sourceRow["loutItemType"] != 'Field' && sourceRow["loutItemType"] != 'Attr')
+					|| (targetRow["loutItemType"] != 'Field' && targetRow["loutItemType"] != 'Attr')) {
 				alert('<%=localeMessage.getString("transformManDetail.alert3")%>');
 				return ;
 			}
@@ -1693,7 +1684,7 @@
 
 			if (targetRow['CNVSNCMDNAME'] == '') {
 				// 변환 명령 값이 한번 설정 되면 변경 되지 않게 함.
-				var cnvsnCmdName = addArrayTag(sourceRow["loutItemType"], addGroupTag(srcGroup,sourceRow["LOUTITEMPATH"]));
+				var cnvsnCmdName = addGroupTag(srcGroup,sourceRow["LOUTITEMPATH"]);
 				// function까지 처리되도록 수정했으나, parameter가 하나인 경우에만 정상처리됨
 				if($('#functionCombo').val() != "") {
 					cnvsnCmdName = $('#functionCombo').val() + "(" + cnvsnCmdName + ")";
@@ -1702,7 +1693,7 @@
 				targetGrid.jqGrid('setCell',tgtRowId,'CNVSNCMDNAME', cnvsnCmdName);
 			}
 
-			targetGrid.jqGrid('setCell',tgtRowId,'CNVSNRSULTITEMPATHNAME',addArrayTag(targetRow["loutItemType"], addGroupTag(tgtGroup,targetRow["LOUTITEMPATH"])));
+			targetGrid.jqGrid('setCell',tgtRowId,'CNVSNRSULTITEMPATHNAME',addGroupTag(tgtGroup,targetRow["LOUTITEMPATH"]));
 			targetGrid.jqGrid('setCell',tgtRowId,'CNVSNITEMSERNO',targetRow['loutItemSerno']);
 			targetGrid.jqGrid('setCell',tgtRowId,'CNVSNSRCITEMS', cnvsnSrcItems);
 			targetGrid.jqGrid('setCell',tgtRowId,'ISVALIDMAPPING', true);
@@ -1894,8 +1885,8 @@
 					if (loutItemType == LAYOUT_ITEM_TYPE_GRID || loutItemType == LAYOUT_ITEM_TYPE_GROUP) {
 						// group 인 경우
 						items = createGridGroupContextMenuItems(grid, rowId);
-					} else if(loutItemType == LAYOUT_ITEM_TYPE_FIELD || loutItemType == LAYOUT_ITEM_TYPE_ARRAY) {
-						// field, array 인 경우
+					} else if(loutItemType == LAYOUT_ITEM_TYPE_FIELD) {
+						// field 인 경우
 						items = createFieldContextMenuItems(grid, positionElement.attr('id'));
 					} else {
 						return false;
@@ -1998,7 +1989,7 @@
 					break;
 				}
 
-				if (loutItemType == LAYOUT_ITEM_TYPE_FIELD || loutItemType == LAYOUT_ITEM_TYPE_ARRAY) {
+				if (loutItemType == LAYOUT_ITEM_TYPE_FIELD) {
 					loutItemPath = loutItemPath.replace(new RegExp("^" + prefix), "");
 					console.debug(grid.getId() + " : loutItemPath : " + loutItemPath);
 					rowData['GROUP_LOUTITEMPATH'] = loutItemPath;

WebContent/jsp/onl/admin/service/stdDefaultMan.jsp

@@ -44,16 +44,14 @@
 	                  '<%=localeMessage.getString("stdDefaultMan.columDesc")%>',
 	                  '<%=localeMessage.getString("stdDefaultMan.columLen")%>',
 	                  '<%=localeMessage.getString("stdDefaultMan.keyOr")%>',
-	                  '<%=localeMessage.getString("stdDefaultMan.ifOr")%>',
-	                  '<%=localeMessage.getString("stdDefaultMan.orderSeq")%>'
+	                  '<%=localeMessage.getString("stdDefaultMan.ifOr")%>'
 	                  ],
 			colModel:[
-					{ name : 'COLUMNNAME'	, align:'left'	, width: '200px', sortable:false		},
-					{ name : 'COLUMNDESC'	, align:'left'	, width: '200px'	},
-					{ name : 'COLUMNLENGTH'	, align:'center'	, width: '100px'	},
-					{ name : 'ISKEY'		, align:'center', width: '100px'	},
-					{ name : 'ISINTERFACE'	, align:'center', width: '100px'	},
-					{ name : 'ORDERSEQ'		, align:'center', width: '100px'	}
+					{ name : 'COLUMNNAME'	, align:'left'	, sortable:false		},
+					{ name : 'COLUMNDESC'	, align:'left'		},
+					{ name : 'COLUMNLENGTH'	, align:'right'		},
+					{ name : 'ISKEY'		, align:'center'	},
+					{ name : 'ISINTERFACE'	, align:'center'	}
 					],
 	        jsonReader: {
 	             repeatitems:false

WebContent/jsp/onl/apim/apigroup/apiGroupManDetail.jsp

@@ -23,7 +23,7 @@
     <script language="javascript" >
         var url = '<c:url value="/onl/apim/apigroup/apiGroupMan.json"/>';
         var url_view = '<c:url value="/onl/apim/apigroup/apiGroupMan.view"/>';
-        var url_popup_view = '<c:url value="/onl/transaction/apim/apiSpecMan.view"/>';
+        var url_popup_view = '<c:url value="/onl/transaction/apim/apiSpecManPopup.view"/>';
 
         var isDetail = false;
         let dialog;

WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp

@@ -300,10 +300,6 @@
 
         <div class="title">Client 정보</div>
         <table id="client" class="table_row" cellspacing="0">
-        	<colgroup>
-        		<col style="width:20%"/>
-        		<col style="width:80%"/>
-        	</colgroup>
             <tr>
                 <th style="width:20%;">이름</th>
                 <td><span id="clientName"></span></td>

WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp

@@ -131,24 +131,6 @@
                 // var reverseNumber = records - ((page - 1) * rowNum + i);
                 $(this).setCell(rows[i], 'rowNum', number);
             }
-
-            // 승인 상태별 행 배경색: 요청됨(#fff3cd) / 진행중(#d1ecf1) 강조
-            if (d && d.rows) {
-                for (var j = 0; j < d.rows.length; j++) {
-                    var st = d.rows[j].approvalStatus || {};
-                    var code = st.code || '';
-                    var desc = st.description || '';
-                    var bg = '';
-                    if (code === 'REQUESTED' || desc === '요청됨') {
-                        bg = '#fff3cd';
-                    } else if (code === 'PROCESSING' || desc === '진행중') {
-                        bg = '#d1ecf1';
-                    }
-                    if (bg) {
-                        $('#grid tr#' + $.jgrid.jqID(d.rows[j].id)).css('background-color', bg);
-                    }
-                }
-            }
           },
           loadError: function(jqXHR, textStatus, errorThrown) {
             var location = '<%=request.getContextPath()%>/';
@@ -194,7 +176,7 @@
         <div class="title">승인 요청 목록<span class="tooltip">승인 요청을 관리합니다.</span></div>
         <c:if test="${hardDeleteEnabled}">
             <div style="background:#fff3cd; border:1px solid #ffc107; padding:8px 15px; margin:5px 0; border-radius:4px; color:#856404;">
-                <strong>[주의]</strong> 삭제 기능은 <strong>개발(dev) 환경에서만</strong> 동작합니다. 선택 삭제 시 승인 요청과 승인자 이력이 DB에서 영구 삭제됩니다.
+                <strong>[주의]</strong> 선택 삭제 시 승인 요청과 승인자 이력이 DB에서 영구 삭제됩니다.
             </div>
         </c:if>
         <form id="ajaxForm" onsubmit="return false;">

WebContent/jsp/onl/apim/approval/portalUserApprovalManPopup.jsp

@@ -392,21 +392,15 @@
 
         <div class="title">사용자 정보</div>
         <table class="table_row" cellspacing="0">
-        	<colgroup>
-        		<col style="width:20%"/>
-        		<col style="width:30%"/>
-        		<col style="width:20%"/>
-        		<col style="width:30%"/>
-        	</colgroup>
             <tr>
-                <th>이메일 아이디</th>
-                <td colspan="3"><span id="loginId"></span></td>
+                <th style="width:20%;">이메일 아이디</th>
+                <td style="width:30%;" colspan="3"><span id="loginId"></span></td>
             </tr>
             <tr>
-                <th>이름</th>
-                <td><span id="userName"></span></td>
-                <th>권한</th>
-                <td><span id="roleCodeDescription"></span></td>
+                <th style="width:20%;">이름</th>
+                <td style="width:30%;"><span id="userName"></span></td>
+                <th style="width:20%;">권한</th>
+                <td style="width:30%;"><span id="roleCodeDescription"></span></td>
             </tr>
             <tr>
                 <th>핸드폰 번호</th>

WebContent/jsp/onl/apim/messagerequest/messageRequestMan.jsp

@@ -1,213 +0,0 @@
-<%@ 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");
-%>
-<html>
-<head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <jsp:include page="/jsp/common/include/css.jsp"/>
-    <jsp:include page="/jsp/common/include/script.jsp"/>
-    <style>
-        .mask-email  { color:#1a73e8; font-weight:bold; }
-        .mask-phone  { color:#d93025; font-weight:bold; }
-        .mask-digits { color:#9334e6; font-weight:bold; }
-        .msg-cell { display:inline-block; max-width:380px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; vertical-align:middle; }
-    </style>
-    <script language="javascript">
-        var url = '<c:url value="/onl/apim/messagerequest/messageRequestMan.json" />';
-        var url_view = '<c:url value="/onl/apim/messagerequest/messageRequestMan.view" />';
-
-        function escapeHtmlJs(s) { return $('<div>').text(s == null ? '' : s).html(); }
-        function escapeAttr(s) { return escapeHtmlJs(s).replace(/"/g, '&quot;'); }
-
-        // 제목: 없으면 messageCode, 마우스오버에 코드명(코드) 표기
-        function formatSubject(cellvalue, options, rowObject) {
-            var code = rowObject.messageCode || '';
-            var subject = (cellvalue && cellvalue !== '') ? cellvalue : '';
-            var title = rowObject.messageCodeName ? (rowObject.messageCodeName + ' (' + code + ')') : code;
-            if (subject) {
-                // 제목이 있으면 2줄: 제목 + 하단에 메세지코드
-                var codeLine = code ? '<br><span style="color:#888;font-size:0.85em;">' + escapeHtmlJs(code) + '</span>' : '';
-                return '<span title="' + escapeAttr(title) + '">' + escapeHtmlJs(subject) + codeLine + '</span>';
-            }
-            // 제목이 없으면 메세지코드만
-            return '<span title="' + escapeAttr(title) + '">' + escapeHtmlJs(code) + '</span>';
-        }
-
-        // 본문: 서버에서 마스킹+escape 된 안전 HTML 그대로 렌더
-        function formatMessage(cellvalue, options, rowObject) {
-            return '<span class="msg-cell">' + (rowObject.messageHtml || '') + '</span>';
-        }
-
-        // 수신자 정보: 휴대폰 / 이메일 / 메신저ID (모두 마스킹됨)
-        function formatReceiverInfo(cellvalue, options, rowObject) {
-            var parts = [];
-            if (rowObject.phone)       parts.push(escapeHtmlJs(rowObject.phone));
-            if (rowObject.email)       parts.push(escapeHtmlJs(rowObject.email));
-            if (rowObject.messengerId) parts.push(escapeHtmlJs(rowObject.messengerId));
-            return parts.join('<br>');
-        }
-
-        function formatRequestDate(cellvalue, options, rowObject) {
-            return '<span title="' + escapeAttr(rowObject.requestDateFull || '') + '">' + escapeHtmlJs(rowObject.requestDateShort || '') + '</span>';
-        }
-        function formatSentDate(cellvalue, options, rowObject) {
-            return '<span title="' + escapeAttr(rowObject.sentDateFull || '') + '">' + escapeHtmlJs(rowObject.sentDateShort || '') + '</span>';
-        }
-
-        function init() {
-            $.ajax({
-                type: "POST", url: url, dataType: "json",
-                data: {cmd: 'LIST_INIT_COMBO'},
-                success: function (json) {
-                    new makeOptions("CODE", "NAME").setObj($("select[name=searchRequestStatus]"))
-                        .setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>")
-                        .setData(json.statusList).rendering();
-                    new makeOptions("CODE", "NAME").setObj($("select[name=searchMessageCode]"))
-                        .setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>")
-                        .setData(json.messageCodeList).rendering();
-
-                    putSelectFromParam();
-
-                    // 콤보 로드 후 그리드 생성 (경합 방지)
-                    buildGrid();
-                },
-                error: function (e) { alert(e.responseText); }
-            });
-        }
-
-        function buildGrid() {
-            $('#grid').jqGrid({
-                datatype: "json", mtype: 'POST', url: url,
-                postData: getSearchForJqgrid("cmd", "LIST"),
-                colNames: ['id', 'No.', '제목', '메세지 내용', '수신자명', '수신자 정보', '유형', '상태', '요청시간', '발송시간'],
-                colModel: [
-                    {name: 'id', align: 'center', key: true, hidden: true},
-                    {name: 'rowNum', align: 'center', width: 45, sortable: false},
-                    {name: 'subject', align: 'left', width: 160, formatter: formatSubject},
-                    {name: 'messageHtml', align: 'left', width: 300, formatter: formatMessage},
-                    {name: 'username', align: 'center', width: 80},
-                    {name: 'receiverInfo', align: 'left', width: 150, formatter: formatReceiverInfo},
-                    {name: 'messageType', align: 'center', width: 60},
-                    {name: 'requestStatus', align: 'center', width: 70},
-                    {name: 'requestDateShort', align: 'center', width: 110, formatter: formatRequestDate},
-                    {name: 'sentDateShort', align: 'center', width: 110, formatter: formatSentDate}
-                ],
-                jsonReader: {repeatitems: false},
-                pager: $('#pager'),
-                page: '${param.page}',
-                rowNum: '${rmsDefaultRowNum}',
-                autoheight: true,
-                height: $("#container").height(),
-                autowidth: true,
-                viewrecords: true,
-                rowList: eval('[${rmsDefaultRowList}]'),
-                ondblClickRow: function (rowId) {
-                    var rowData = $(this).getRowData(rowId);
-                    var id = rowData['id'];
-                    var url2 = url_view + '?cmd=DETAIL';
-                    url2 += '&page=' + $(this).getGridParam("page");
-                    url2 += '&returnUrl=' + getReturnUrl();
-                    url2 += '&menuId=' + '${param.menuId}';
-                    url2 += '&id=' + id;
-                    goNav(url2);
-                },
-                loadComplete: function () {
-                    var page = $(this).getGridParam('page');
-                    var rowNum = $(this).getGridParam('rowNum');
-                    var rows = $(this).getDataIDs();
-                    var colModel = $(this).getGridParam("colModel");
-                    for (var i = 0; i < rows.length; i++) {
-                        var number = ((page - 1) * rowNum + i) + 1;
-                        $(this).setCell(rows[i], 'rowNum', number);
-                    }
-                    // 서버 고정 정렬(요청일 역순) — 컬럼 정렬 비활성
-                    for (var i = 0; i < colModel.length; i++) {
-                        $(this).setColProp(colModel[i].name, {sortable: false});
-                    }
-                },
-                loadError: function (jqXHR, textStatus, errorThrown) {
-                    var location = '<%=request.getContextPath()%>/';
-                    comloadError(jqXHR, textStatus, errorThrown, location);
-                }
-            });
-            resizeJqGridWidth('grid', 'content_middle', '1000');
-        }
-
-        $(document).ready(function () {
-            init();
-
-            $("#btn_search").click(function () {
-                var postData = getSearchForJqgrid("cmd", "LIST");
-                $("#grid").setGridParam({url: url, postData: postData, page: 1}).trigger("reloadGrid");
-            });
-
-            $("select[name^=search]").change(function () { $("#btn_search").click(); });
-            $("input[name^=search]").keydown(function (key) {
-                if (key.keyCode == 13) { $("#btn_search").click(); }
-            });
-
-            buttonControl();
-        });
-    </script>
-</head>
-<body>
-<div class="right_box">
-    <div class="content_top">
-        <ul class="path"><li><a href="#">${rmsMenuPath}</a></li></ul>
-    </div><!-- end content_top -->
-    <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>
-        </div>
-        <div class="title">메세지 발송 내역<span class="tooltip">발송 요청 이력을 조회합니다. 개인정보는 마스킹되어 표시됩니다.</span></div>
-        <form id="ajaxForm" onsubmit="return false;">
-            <table class="search_condition" cellspacing=0;>
-                <colgroup>
-                    <col style="width:120px;"><col style="width:200px;">
-                    <col style="width:120px;"><col style="width:200px;">
-                    <col style="width:120px;"><col style="width:200px;">
-                </colgroup>
-                <tbody>
-                <tr>
-                    <th>상태</th>
-                    <td><div class="select-style"><select name="searchRequestStatus"></select></div></td>
-                    <th>메세지 코드</th>
-                    <td><div class="select-style"><select name="searchMessageCode"></select></div></td>
-                    <th>수신자명</th>
-                    <td><input type="text" name="searchRecipient" autocomplete="off"></td>
-                </tr>
-                <tr>
-                    <th>유형</th>
-                    <td>
-                        <div class="select-style">
-                            <select name="searchMessageType">
-                                <option value="">전체</option>
-                                <option value="EMAIL">EMAIL</option>
-                                <option value="SMS">SMS</option>
-                                <option value="KAKAO">KAKAO</option>
-                                <option value="MESSENGER">MESSENGER</option>
-                            </select>
-                        </div>
-                    </td>
-                    <th>요청기간</th>
-                    <td colspan="3">
-                        <input type="date" name="searchFromDate"> ~ <input type="date" name="searchToDate">
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </form>
-        <table id="grid"></table>
-        <div id="pager"></div>
-    </div><!-- end content_middle -->
-</div><!-- end right_box -->
-</body>
-</html>

WebContent/jsp/onl/apim/messagerequest/messageRequestManDetail.jsp

@@ -1,149 +0,0 @@
-<%@ 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");
-%>
-<html>
-<head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <jsp:include page="/jsp/common/include/css.jsp"/>
-    <jsp:include page="/jsp/common/include/script.jsp"/>
-    <style>
-        .mask-email  { color:#1a73e8; font-weight:bold; }
-        .mask-phone  { color:#d93025; font-weight:bold; }
-        .mask-digits { color:#9334e6; font-weight:bold; }
-        .msg-detail { white-space:pre-wrap; word-break:break-all; min-height:80px; line-height:1.6; }
-    </style>
-    <script language="javascript">
-        var url = '<c:url value="/onl/apim/messagerequest/messageRequestMan.json" />';
-        var url_view = '<c:url value="/onl/apim/messagerequest/messageRequestMan.view" />';
-        var key = '${param.id}';
-
-        function detail() {
-            if (!key) return;
-            $.ajax({
-                type: "POST", url: url, dataType: "json",
-                data: {cmd: 'DETAIL', id: key},
-                success: function (data) {
-                    var codeText = (data.messageCodeName || '') + (data.messageCode ? ' (' + data.messageCode + ')' : '');
-                    $('#messageCodeName').text(codeText);
-                    $('#subject').text((data.subject && data.subject !== '') ? data.subject : (data.messageCode || ''));
-                    $('#messageType').text(data.messageType || '');
-                    $('#requestStatus').text(data.requestStatus || '');
-                    $('#username').text(data.username || '');
-                    $('#email').text(data.email || '');
-                    $('#phone').text(data.phone || '');
-                    $('#messengerId').text(data.messengerId || '');
-                    $('#umsUid').text(data.umsUid || '');
-                    $('#eaiInterfaceId').text(data.eaiInterfaceId || '');
-                    $('#serviceId').text(data.serviceId || '');
-                    $('#requestDate').text(data.requestDateFull || '');
-                    $('#sentDate').text(data.sentDateFull || '');
-                    // 서버에서 마스킹+escape 된 안전 HTML
-                    $('#messageHtml').html(data.messageHtml || '');
-
-                    // PENDING 건만 '실패 처리' 노출 (권한 제어는 buttonControl 이 담당)
-                    if (data.requestStatus !== 'PENDING') {
-                        $('#btn_fail').hide();
-                    }
-                },
-                error: function (e) { alert(e.responseText); }
-            });
-        }
-
-        $(document).ready(function () {
-            var returnUrl = getReturnUrlForReturn();
-
-            buttonControl();
-            detail();
-
-            $('#btn_fail').click(function () {
-                if (!confirm('이 건을 FAILED(발송 실패) 상태로 변경하시겠습니까?')) return;
-                $.ajax({
-                    type: "POST", url: url, dataType: "json",
-                    data: {cmd: 'UPDATE_STATUS', id: key},
-                    success: function () {
-                        alert("변경되었습니다.");
-                        detail();
-                    },
-                    error: function (e) { alert(e.responseText); }
-                });
-            });
-
-            $('#btn_previous').click(function () { goNav(returnUrl); });
-        });
-    </script>
-</head>
-<body>
-<div class="right_box">
-    <div class="content_top">
-        <ul class="path"><li><a href="#">${rmsMenuPath}</a></li></ul>
-    </div>
-    <div class="content_middle">
-        <div class="search_wrap">
-            <button type="button" class="cssbtn" id="btn_fail" level="W" status="DETAIL" style="background-color:#dc3545;border-color:#dc3545;color:#fff;"><i class="material-icons">report</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" id="title">메세지 발송 내역 상세<span class="tooltip">개인정보는 마스킹되어 표시됩니다.</span></div>
-        <table class="table_row" cellspacing="0">
-            <colgroup>
-                <col style="width:12%"/><col style="width:38%"/>
-                <col style="width:12%"/><col style="width:38%"/>
-            </colgroup>
-            <tr>
-                <th>메세지 코드</th>
-                <td colspan="3"><span id="messageCodeName"></span></td>
-            </tr>
-            <tr>
-                <th>제목</th>
-                <td colspan="3"><span id="subject"></span></td>
-            </tr>
-            <tr>
-                <th>유형</th>
-                <td><span id="messageType"></span></td>
-                <th>상태</th>
-                <td><span id="requestStatus"></span></td>
-            </tr>
-            <tr>
-                <th>수신자명</th>
-                <td><span id="username"></span></td>
-                <th>메신저 ID</th>
-                <td><span id="messengerId"></span></td>
-            </tr>
-            <tr>
-                <th>이메일</th>
-                <td><span id="email"></span></td>
-                <th>휴대폰</th>
-                <td><span id="phone"></span></td>
-            </tr>
-            <tr>
-                <th>요청 시간</th>
-                <td><span id="requestDate"></span></td>
-                <th>발송 시간</th>
-                <td><span id="sentDate"></span></td>
-            </tr>
-            <tr>
-                <th>EAI 인터페이스 ID</th>
-                <td><span id="eaiInterfaceId"></span></td>
-                <th>서비스 ID</th>
-                <td><span id="serviceId"></span></td>
-            </tr>
-            <tr>
-                <th>UMS UID</th>
-                <td colspan="3"><span id="umsUid"></span></td>
-            </tr>
-            <tr>
-                <th>메세지 내용</th>
-                <td colspan="3"><div id="messageHtml" class="msg-detail"></div></td>
-            </tr>
-        </table>
-    </div>
-</div>
-</body>
-</html>

WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp

@@ -22,8 +22,6 @@
 		function formatInquiryStatus(cellvalue, options, rowObject) {
 			if (cellvalue == 'PENDING') {
 				return '<span style="color: red;">문의중</span>';
-			} else if (cellvalue == 'REVIEWING') {
-				return '<span >문의검토중</span>'
 			} else if (cellvalue == 'RESPONDED') {
 				return '<span >답변완료</span>'
 			} else if (cellvalue == 'CLOSED') {
@@ -33,17 +31,6 @@
 			}
 		}
 
-		function formatVisibility(cellvalue, options, rowObject) {
-			if (cellvalue == 'PRIVATE') {
-				return '<span style="color:#c0392b; font-weight:bold;">비공개</span>';
-			} else if (cellvalue == 'ALL') {
-				return '전체공개';
-			} else if (cellvalue == 'ORG') {
-				return '법인공개';
-			}
-			return cellvalue;
-		}
-
 		function formatFile(cellvalue, options, rowObject) {
 			var iconPath = '${pageContext.request.contextPath}/images/icon_file.png';
 			var icon = rowObject.hasAttachment ? '<img src="' + iconPath + '" alt="File Attached" style="vertical-align: middle; margin-left: 5px; width: 16px; height: 16px;">' : '';
@@ -112,14 +99,13 @@
 				mtype: 'POST',
 				url: url,
 				postData : { cmd : 'LIST' },
-				colNames:['No.', 'id', '제목', '법인명', '상태', '공개범위', '작성자', '등록일', '답변자','답변일'],
+				colNames:['No.', 'id', '제목', '법인명', '상태', '작성자', '등록일', '답변자','답변일'],
 				colModel:[
 					{ name : 'rowNum'           , align:'center', width:50, sortable:false },
 					{ name : 'id'               , align:'center', key:true, hidden:true},
 					{ name : 'inquirySubject'   , align:'left'  , width:200 , formatter: formatFile},
 					{ name : 'orgName'   		, align:'center'  , width:100 , },
 					{ name : 'inquiryStatus'    , align:'center', width:70, formatter: formatInquiryStatus },
-					{ name : 'visibility'       , align:'center', width:70, formatter: formatVisibility },
 					{ name : 'inquirer.userName', align:'center', width:70 },
 					{ name : 'createdDate'      , align:'center', width:100, formatter: timeStampFormat },
 					{ name : 'responderName'    , align:'center', width:70 },
@@ -221,9 +207,7 @@
 							<select name="searchInquiryStatus">
 								<option value="">전체</option>
 								<option value="PENDING">문의중</option>
-								<option value="REVIEWING">문의검토중</option>
 								<option value="RESPONDED">답변완료</option>
-								<option value="CLOSED">답변종료</option>
 							</select>
 						</div>
 					</td>

WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp

@@ -79,46 +79,12 @@
 			margin-left: 2px;
 			font-weight: bold;
 		}
-
-		.reason-modal-overlay {
-			display: none;
-			position: fixed;
-			top: 0; left: 0;
-			width: 100%; height: 100%;
-			background: rgba(0, 0, 0, 0.4);
-			z-index: 1000;
-		}
-		.reason-modal-box {
-			position: absolute;
-			top: 50%; left: 50%;
-			transform: translate(-50%, -50%);
-			background: #fff;
-			border-radius: 6px;
-			padding: 20px;
-			width: 400px;
-			box-shadow: 0 4px 20px rgba(0, 0, 0, 0.2);
-		}
-		.reason-modal-box h3 {
-			margin: 0 0 12px;
-			font-size: 16px;
-		}
-		.reason-modal-box textarea {
-			width: 100%;
-			min-height: 80px;
-			box-sizing: border-box;
-		}
-		.reason-modal-actions {
-			margin-top: 12px;
-			text-align: right;
-		}
 	</style>
 	<script language="javascript">
 		var url = '<c:url value="/onl/apim/portalinquiry/portalInquiryMan.json" />';
 		var url_view = '<c:url value="/onl/apim/portalinquiry/portalInquiryMan.view" />';
 		var file_download = '<c:url value="/file/download.do" />';
 		var inquiryStatus = 'PENDING';
-		var originalVisibility = 'ORG';
-		var reasonModalCallback = null;
 
 		function decodeHTMLEntities(text) {
 			var textArea = document.createElement('textarea');
@@ -142,9 +108,7 @@
 					
 					inquiryStatus = data.inquiryStatus;
 					if (data.inquiryStatus == 'PENDING') {
-						$("#inquiryStatus").text('문의중');
-					} else if (data.inquiryStatus == 'REVIEWING') {
-						$("#inquiryStatus").text('문의검토중');
+						$("#inquiryStatus").text('문의중');	
 					} else if (data.inquiryStatus == 'RESPONDED') {
 						$("#inquiryStatus").text('답변완료');
 					} else if (data.inquiryStatus == 'CLOSED') {
@@ -158,24 +122,6 @@
 					var decodedContent = decodeHTMLEntities(data.responseDetail);
 					$("#responseDetail").summernote('code', decodedContent || '');
 
-					// 공개범위 / 조회수
-					$('#visibilitySelect').val(data.visibility || 'ORG');
-					originalVisibility = data.visibility || 'ORG';
-					$('#viewCount').text(data.viewCount || 0);
-
-					// 조회수 증가 (sessionStorage dedup — 새로고침 시 중복 증가 억제)
-					var viewedKey = 'inquiry_viewed_' + key;
-					if (!sessionStorage.getItem(viewedKey)) {
-						$.ajax({
-							type: "POST",
-							url: url,
-							data: {cmd: 'INCREMENT_VIEW', id: key},
-							success: function () {
-								sessionStorage.setItem(viewedKey, 'true');
-							}
-						});
-					}
-
 					// 댓글 표시
 					listComment(key);
 
@@ -201,17 +147,8 @@
 					if (!data || data.length === 0) return;
 					$.each(data, function (i, comment) {
 						var date = comment.createdDate ? timeStampFormat(comment.createdDate) : '';
-						var isPrivate = comment.visibility === 'PRIVATE';
 						var row = $('<div>').addClass('info-row');
-						if (isPrivate) {
-							// 비공개 댓글은 색상으로 구별
-							row.css({'background-color': '#FFF5F5', 'border-radius': '4px', 'padding': '4px'});
-						}
-						var labelDiv = $('<div>').addClass('info-label').css('color', '#555').text(comment.writerName || '');
-						if (isPrivate) {
-							$('<span>').text(' 비공개').css({'color': '#c0392b', 'font-size': '0.85em', 'font-weight': 'bold'}).appendTo(labelDiv);
-						}
-						labelDiv.appendTo(row);
+						$('<div>').addClass('info-label').css('color', '#555').text(comment.writerName || '').appendTo(row);
 						var content = $('<div>').addClass('info-content');
 						$('<div>').css('white-space', 'pre-wrap').text(comment.commentDetail).appendTo(content);
 						var meta = $('<div>').css({'font-size': '0.9em', 'color': '#999', 'margin-top': '2px'});
@@ -222,19 +159,6 @@
 							})(comment.id, comment.inquiryId))
 							.appendTo(meta);
 						meta.appendTo(content);
-
-						// 댓글 공개범위 변경 컨트롤 (사유 필수)
-						var visCtrl = $('<div>').css({'margin-top': '4px', 'font-size': '0.85em'});
-						var sel = $('<select>').append('<option value="ALL">공개</option>').append('<option value="PRIVATE">비공개</option>');
-						sel.val(comment.visibility || 'ALL');
-						var reasonInput = $('<input>').attr({'type': 'text', 'placeholder': '변경 사유'}).css({'margin-left': '4px'});
-						var applyBtn = $('<button>').attr('type', 'button').addClass('cssbtn smallBtn2').css({'margin-left': '4px', 'font-size': '0.85em', 'padding': '1px 6px'})
-							.text('공개범위변경').on('click', (function(id, inquiryId, selEl, reasonEl) {
-								return function() { changeCommentVisibility(id, inquiryId, selEl.val(), reasonEl.val()); };
-							})(comment.id, comment.inquiryId, sel, reasonInput));
-						visCtrl.append(sel).append(reasonInput).append(applyBtn);
-						visCtrl.appendTo(content);
-
 						content.appendTo(row);
 						row.appendTo($commentList);
 					});
@@ -245,84 +169,6 @@
 			});
 		}
 
-		function openReasonModal(callback) {
-			reasonModalCallback = callback;
-			$('#reasonModalInput').val('');
-			$('#reasonModal').show();
-			$('#reasonModalInput').focus();
-		}
-
-		function closeReasonModal() {
-			$('#reasonModal').hide();
-			reasonModalCallback = null;
-		}
-
-		// 답변(summernote) 내용이 실제로 입력됐는지 확인
-		function hasAnswerContent() {
-			var v = $('#responseDetail').summernote('code');
-			var text = $('<div>').html(v || '').text().replace(/ /g, ' ').trim();
-			return text.length > 0;
-		}
-
-		function saveInquiryAnswer(returnUrl) {
-			var postData = $('#ajaxForm').serializeArray();
-			postData.push({name: "cmd", value: "INSERT"});
-			$.ajax({
-				type: "POST",
-				url: url,
-				data: postData,
-				success: function (json) {
-					alert("<%= localeMessage.getString("common.saveMsg") %>");
-					goNav(returnUrl);
-				},
-				error: function (e) {
-					alert(e.responseText);
-				}
-			});
-		}
-
-		// 게시물 공개범위 변경(사유 필수). 성공 후 답변 내용이 있으면 이어서 저장.
-		function changeInquiryVisibility(newVis, reason, returnUrl, thenSaveAnswer) {
-			$.ajax({
-				type: "POST",
-				url: url,
-				data: {cmd: 'VISIBILITY', serviceType: 'APIGW', targetType: 'INQUIRY', id: $('#id').val(),
-					visibility: newVis, auditReason: reason},
-				success: function () {
-					originalVisibility = newVis;
-					if (thenSaveAnswer) {
-						saveInquiryAnswer(returnUrl);
-					} else {
-						alert('변경되었습니다.');
-						goNav(returnUrl);
-					}
-				},
-				error: function (e) {
-					alert(e.responseText);
-				}
-			});
-		}
-
-		function changeCommentVisibility(commentId, inquiryId, visibility, reason) {
-			if (!reason || !reason.trim()) {
-				alert('공개범위 변경 사유를 입력하세요.');
-				return;
-			}
-			if (!confirm('댓글 공개범위를 변경하시겠습니까?')) return;
-			$.ajax({
-				type: "POST",
-				url: url,
-				data: {cmd: 'VISIBILITY', serviceType: 'APIGW', targetType: 'COMMENT', id: commentId, visibility: visibility, auditReason: reason},
-				success: function () {
-					alert('변경되었습니다.');
-					listComment(inquiryId);
-				},
-				error: function (e) {
-					alert(e.responseText);
-				}
-			});
-		}
-
 		function deleteComment(commentId, inquiryId) {
 			if (inquiryStatus == 'CLOSED') {
 				alert('답변이 종료되어 삭제할 수 없습니다');
@@ -362,38 +208,24 @@
 					alert('답변이 종료되어 수정할 수 없습니다');
 					return;
 				}
-
-				var newVis = $('#visibilitySelect').val();
-				var visChanged = (newVis !== originalVisibility);
-
-				if (visChanged) {
-					// 공개범위 변경 감지 → 사유 입력 모달 (답변 내용이 있으면 함께 저장)
-					var saveAnswerToo = hasAnswerContent();
-					openReasonModal(function (reason) {
-						changeInquiryVisibility(newVis, reason, returnUrl, saveAnswerToo);
-					});
-					return;
-				}
-
-				// 공개범위 변경 없음 → 기존 답변 저장
 				if (!checkRequired("ajaxForm")) return;
 				if (!confirm("<%= localeMessage.getString("common.checkSave")%>")) return;
-				saveInquiryAnswer(returnUrl);
-			});
 
-			$("#reasonModalOk").click(function () {
-				var reason = ($('#reasonModalInput').val() || '').trim();
-				if (!reason) {
-					alert('변경 사유를 입력하세요.');
-					return;
-				}
-				var cb = reasonModalCallback;
-				closeReasonModal();
-				if (cb) cb(reason);
-			});
+				var postData = $('#ajaxForm').serializeArray();
+				postData.push({name: "cmd", value: "INSERT"});
 
-			$("#reasonModalCancel").click(function () {
-				closeReasonModal();
+				$.ajax({
+					type: "POST",
+					url: url,
+					data: postData,
+					success: function (json) {
+						alert("<%= localeMessage.getString("common.saveMsg") %>");
+						goNav(returnUrl);
+					},
+					error: function (e) {
+						alert(e.responseText);
+					}
+				});
 			});
 			
 			$("#btn_comment").click(function () {
@@ -476,22 +308,7 @@
 					<div class="info-label">작성일</div>
 					<div id="createdDate" class="info-content"></div>
 				</div>
-				<div class="info-row">
-						<div class="info-label">조회수</div>
-						<div id="viewCount" class="info-content">0</div>
-					</div>
-					<div class="info-row">
-						<div class="info-label">공개범위</div>
-						<div class="info-content" style="display:flex; gap:8px; align-items:center;">
-							<select id="visibilitySelect">
-								<option value="ALL">전체공개</option>
-								<option value="ORG">법인공개</option>
-								<option value="PRIVATE">비공개</option>
-							</select>
-							<span style="font-size:0.85em; color:#999;">변경 후 상단 [수정] 버튼을 누르면 사유 입력창이 표시됩니다.</span>
-						</div>
-					</div>
-					<div class="info-row" id="attachFileRow" style="display: none;">
+				<div class="info-row" id="attachFileRow" style="display: none;">
 					<div class="info-label">첨부파일</div>
 					<div id="attachFiles" class="info-content"></div>
 				</div>
@@ -539,17 +356,5 @@
 		</form>
 	</div>
 </div>
-
-<!-- 공개범위 변경 사유 입력 모달 -->
-<div id="reasonModal" class="reason-modal-overlay">
-	<div class="reason-modal-box">
-		<h3>공개범위 변경 사유</h3>
-		<textarea id="reasonModalInput" placeholder="변경 사유를 입력하세요."></textarea>
-		<div class="reason-modal-actions">
-			<button type="button" class="cssbtn" id="reasonModalOk">확인</button>
-			<button type="button" class="cssbtn" id="reasonModalCancel">취소</button>
-		</div>
-	</div>
-</div>
 </body>
 </html>

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

@@ -20,9 +20,7 @@
 		var combo;
 		
 		function formatNoticeType(cellvalue, options, rowObject) {
-			if (!combo || !combo.noticeTypeList) {
-				return cellvalue;
-			}
+			var name = "";
 			for (var i = 0; i < combo.noticeTypeList.length; i++) {
 				if (combo.noticeTypeList[i].CODE == cellvalue) {
 					return combo.noticeTypeList[i].NAME;	
@@ -48,39 +46,8 @@
 			var icon = rowObject.hasAttachment ? '<img src="' + iconPath + '" alt="File Attached" style="vertical-align: middle; margin-left: 5px; width: 16px; height: 16px;">' : '';
 			return cellvalue + icon;
 		}
-
-		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('삭제 중 오류가 발생했습니다.');
-				}
-			});
-		}
-
-
+		
+		
 		function init(){
 			$.ajax({
 				type : "POST",
@@ -91,11 +58,8 @@
 					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);
@@ -103,8 +67,8 @@
 			});
 		}
 
-		function buildGrid(){
-
+		$(document).ready(function() {
+						
 			$('#grid').jqGrid({
 				datatype:"json",
 				mtype: 'POST',
@@ -139,8 +103,6 @@
 				autowidth: true,
 				viewrecords: true,
 				rowList : eval('[${rmsDefaultRowList}]'),
-				multiselect: true,
-				multiboxonly: true,
 				ondblClickRow: function(rowId) {
 					var rowData = $(this).getRowData(rowId);
 					var id = rowData['id'];
@@ -177,14 +139,10 @@
 				}
 			});
 
-			resizeJqGridWidth('grid','content_middle','1000');
-		}
-
-		$(document).ready(function() {
-
-			// 콤보 로드 → 콤보 성공 콜백에서 buildGrid() 호출 (경합 방지)
 			init();
 
+			resizeJqGridWidth('grid','content_middle','1000');
+
 			$("#btn_search").click(function(){
 				var postData = getSearchForJqgrid("cmd","LIST");
 				$("#grid").setGridParam({ url:url,postData: postData ,page:1 }).trigger("reloadGrid");
@@ -199,10 +157,6 @@
 				goNav(url2);
 			});
 
-			$("#btn_delete_selected").click(function(){
-				deleteSelectedRows();
-			});
-
 			$("select[name=searchUseYn], input[name^=search]").keydown(function(key){
 				if (key.keyCode == 13){
 					$("#btn_search").click();
@@ -225,7 +179,6 @@
 		<div class="search_wrap">
 			<button type="button" class="cssbtn" id="btn_new" level="W"><i class="material-icons">add</i> <%= localeMessage.getString("button.new") %></button>
 			<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">공지사항 목록<span class="tooltip">공지사항을 관리합니다.</span></div>
 		<form id="ajaxForm"  onsubmit="return false;">

WebContent/jsp/onl/apim/portalorg/portalOrgMan.jsp

@@ -312,9 +312,7 @@ $(document).ready(function() {
 	  <div class="content_middle" id="content_middle">
 		<div class="search_wrap">
 			<button type="button" class="cssbtn" id="btn_new" level="W"><i class="material-icons">add</i> <%= localeMessage.getString("button.new") %></button>
-			<c:if test="${hardDeleteEnabled}">
 			<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>
-			</c:if>
 			<button type="button" class="cssbtn" id="btn_search" level="R"><i class="material-icons">search</i> <%= localeMessage.getString("button.search") %></button>
 		</div>
 		  <%--법인정보관리--%>

WebContent/jsp/onl/apim/portalorg/portalOrgManDetail.jsp

@@ -1,7 +1,5 @@
 <%@ page language="java" contentType="text/html;  charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ page import="java.io.*"%>
-<%@ page import="com.eactive.eai.rms.common.util.CommonUtil"%>
-<%@ page import="com.eactive.eai.rms.common.context.MonitoringContext"%>
 <%@ 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" %>
@@ -9,9 +7,6 @@
 	response.setHeader("Pragma", "No-cache");
 	response.setHeader("Cache-Control", "no-cache");
 	response.setHeader("Expires", "0");
-	
-	MonitoringContext monitoringContext = (MonitoringContext)CommonUtil.getBean(request, "monitoringContext");
-	String reverseProxyUrl = monitoringContext.getStringProperty(MonitoringContext.RMS_WEBHOOK_REVERSE_PROXY_URL, "");
 %>
 <%!
 	public String getRequiredLabel(String label) {
@@ -138,15 +133,10 @@
 						$("#btn_delete").hide();
 					}
 
-					$("select[name=approvalStatus]").val(portalOrgData.approvalStatus);
-					// 승인상태는 읽기전용(수정 불가) - 값은 그대로 제출되도록 disabled 대신 잠금 처리
-					$("select[name=approvalStatus]")
-							.css({'pointer-events':'none', 'background-color':'#eee'})
-							.attr('tabindex', '-1');
+					$("#approvalStatus").val(portalOrgData.approvalStatus);
 					$("#compRegNo").val(formatCompanyRegNo(portalOrgData.compRegNo));
 					$("#corpRegNo").val(formatCorpRegNo(portalOrgData.corpRegNo));
 					$("#createdDate").inputmask("9999-99-99 99:99:99", {'autoUnmask': true});
-					$("#reverseProxyPath").val(portalOrgData.reverseProxyPath);
 
 					// 전화번호 처리
 					if (portalOrgData.scPhoneNumber) {
@@ -414,6 +404,47 @@
 				downloadFile(fileId, '1');  // fileSn은 '1'로 가정
 			});
 
+			// OBP 파트너코드 조회 버튼 클릭
+			$("#btn_query_obp").click(function() {
+				var compRegNo = $("#compRegNo").val();
+				if (!compRegNo) {
+					jSuites.notification({ name: '알림', message: '사업자등록번호를 먼저 입력해주세요.', error: true });
+					$("#compRegNo").focus();
+					return;
+				}
+
+				// 하이픈 제거
+				compRegNo = compRegNo.replace(/-/g, '');
+
+				$.ajax({
+					type: "POST",
+					url: url,
+					dataType: "json",
+					data: {
+						cmd: 'QUERY_OBP_PARTNER_CODE',
+						compRegNo: compRegNo
+					},
+					beforeSend: function() {
+						$("#btn_query_obp").prop("disabled", true).html('<i class="material-icons">hourglass_empty</i> 조회중...');
+					},
+					success: function(json) {
+						if (json.success) {
+							$("#orgCode").val(json.partnerCode);
+							jSuites.notification({ name: '성공', message: '파트너코드가 조회되었습니다: ' + json.partnerCode });
+						} else {
+							jSuites.notification({ name: '실패', message: json.message, error: true });
+						}
+					},
+					error: function(e) {
+						jSuites.notification({ name: '오류', message: '파트너코드 조회 중 오류가 발생했습니다.', error: true });
+						console.error(e.responseText);
+					},
+					complete: function() {
+						$("#btn_query_obp").prop("disabled", false).html('<i class="material-icons">search</i> 파트너코드 조회');
+					}
+				});
+			});
+
 			$("#btn_modify").click(function(){
 				if (!checkRequired("ajaxForm")) return;
 
@@ -484,7 +515,8 @@
 					}
 				}
 
-				// 저장 확인/사유 입력은 유효성 검사 및 FormData 구성 후 처리 (하단 submit 분기)
+				if (confirm("<%= localeMessage.getString("common.checkSave")%>") !== true)
+					return;
 
 				// FormData 생성 전에 분리된 전화번호 필드 제거
 				$("#scPhonePrefix, #scPhoneMiddle, #scPhoneLast, #orgPhonePrefix, #orgPhoneMiddle, #orgPhoneLast").removeAttr('name');
@@ -519,47 +551,23 @@
 				}
 
 
-				// cmd 및 사유(auditReason) 첨부 후 전송
-				function submitOrg(cmd, auditReason) {
-					formData.append("cmd", cmd);
-					// 감사로그(AUDIT_LOG) 발화를 위한 systemCode. 법인/가입자 리포지토리는 고정 EMS 스키마라 스키마 전환 영향 없음
-					formData.append("serviceType", "APIGW");
-					if (auditReason) {
-						formData.append("auditReason", auditReason);
+				// cmd 파라미터 추가
+				formData.append("cmd", isDetail ? "UPDATE" : "INSERT");
+
+				$.ajax({
+					type : "POST",
+					url:url,
+					data:	formData,
+					processData: false,
+					contentType: false,
+					success:function(json){
+						alert("<%= localeMessage.getString("common.saveMsg") %>");
+						goNav(returnUrl);
+					},
+					error:function(e){
+						alert(e.responseText);
 					}
-
-					$.ajax({
-						type : "POST",
-						url:url,
-						data:	formData,
-						processData: false,
-						contentType: false,
-						success:function(json){
-							alert("<%= localeMessage.getString("common.saveMsg") %>");
-							goNav(returnUrl);
-						},
-						error:function(e){
-							alert(e.responseText);
-						}
-					});
-				}
-
-				if (isDetail) {
-					// 수정: 상태를 REMOVED로 바꾼 경우 삭제(cmd=DELETE)로 감사 기록 + 익명화
-					var targetCmd = ($("#orgStatus").val() === 'REMOVED') ? "DELETE" : "UPDATE";
-					var isRemove = (targetCmd === "DELETE");
-					showReasonPrompt(
-						isRemove ? "해당 법인을 삭제(탈퇴) 처리합니다. 사유를 입력해 주세요." : "법인 정보를 수정합니다. 사유를 입력해 주세요.",
-						{
-							title: isRemove ? "삭제 사유" : "수정 사유",
-							onConfirm: function(reason) { submitOrg(targetCmd, reason); }
-						}
-					);
-				} else {
-					// 신규 등록: 사유 불필요
-					if (confirm("<%= localeMessage.getString("common.checkSave")%>") !== true) return;
-					submitOrg("INSERT", null);
-				}
+				});
 			});
 
 			$("#btn_previous").click(function() {
@@ -568,28 +576,25 @@
 
 			$("#btn_delete").click(function(){
 
-				showReasonPrompt("해당 법인을 삭제 처리합니다. 사유를 입력해 주세요.", {
-					title: "삭제 사유",
-					onConfirm: function(reason) {
-						var postData = $('#ajaxForm').serializeArray();
-						postData.push({name: "cmd" , value:"DELETE"});
-						postData.push({name: "serviceType", value: "APIGW"});
-						postData.push({name: "auditReason", value: reason});
+				if(confirm("<%= localeMessage.getString("common.confirmMsg")%>")){
+					var postData = $('#ajaxForm').serializeArray();
+					postData.push({name: "cmd" , value:"DELETE"});
 
-						$.ajax({
-							type : "POST",
-							url:url,
-							data:postData,
-							success:function(args){
-								alert("<%= localeMessage.getString("common.deleteMsg") %>");
-								goNav(returnUrl);
-							},
-							error:function(e){
-								alert(e.responseText);
-							}
-						});
-					}
-				});
+					$.ajax({
+						type : "POST",
+						url:url,
+						data:postData,
+						success:function(args){
+							alert("<%= localeMessage.getString("common.deleteMsg") %>");
+							goNav(returnUrl);
+						},
+						error:function(e){
+							alert(e.responseText);
+						}
+					});
+				}else{
+					return false;
+				}
 
 			});
 
@@ -625,7 +630,10 @@
 				<tr>
 					<th style="width:15%;"><%= localeMessage.getString("portalOrg.orgCode") %></th>
 					<td colspan="3" style="width:35%;">
-						<input type="text" name="orgCode" id="orgCode"/>
+						<div style="display: flex; align-items: center;">
+							<input type="text" name="orgCode" id="orgCode" style="width: 200px; margin-right: 10px;"/>
+							<button type="button" class="cssbtn smallBtn" id="btn_query_obp"><i class="material-icons">search</i> 파트너코드 조회</button>
+						</div>
 					</td>
 					<th><%= localeMessage.getString("portalOrg.orgIndustryType") %></th> <%--업종--%>
 					<td><input type="text" name="orgIndustryType" id="orgIndustryType" maxlength="50" /></td>
@@ -730,16 +738,6 @@
 						</div>
 					</td>
 				</tr>
-				<tr>
-					<th><%= localeMessage.getString("portalOrg.reverseProxyPath") %></th>
-					<td colspan="3">
-						<%=reverseProxyUrl %>/<input type="text" name="reverseProxyPath" id="reverseProxyPath" style="width:100px; "/>
-					</td>
-					<th></th>
-					<td>
-						
-					</td>
-				</tr>
 				<tr><%--사업자등록증--%>
 					<th><%= localeMessage.getString("portalOrg.compRegFile") %></th>
 					<td colspan="5" style="padding-top:  5px; padding-bottom: 5px;">

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

@@ -26,38 +26,7 @@ function formatFile(cellvalue, options, rowObject) {
 	return cellvalue + icon;
 }
 
-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() {
+$(document).ready(function() {	
 	$('#grid').jqGrid({
 		datatype:"json",
 		mtype: 'POST',
@@ -76,7 +45,7 @@ $(document).ready(function() {
 				],
         jsonReader: {
              repeatitems:false
-        },
+        },	          
 		pager : $('#pager'),
 		page : '${param.page}',
 		rowNum : '${rmsDefaultRowNum}',
@@ -85,8 +54,6 @@ $(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'];
@@ -127,14 +94,10 @@ $(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();
@@ -157,9 +120,8 @@ $(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,27 +92,6 @@ $(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("마스킹 해제 사유를 입력하세요:");
 
@@ -155,10 +134,9 @@ $(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/apim/portalproperty/propertyMan.jsp

@@ -86,11 +86,9 @@
                 editurl: "clientArray",
                 colNames: ['<%= localeMessage.getString("propertyDetail.propertyKey") %>',
                     '<%= localeMessage.getString("propertyDetail.propertyValue") %>',
-                    '설명',
                     '<%= localeMessage.getString("propertyDetail.delYn") %>'],
                 colModel: [{name: 'PRPTYNAME', width: 50, align: 'left', editable: true},
-                    {name: 'PRPTY2VAL', width: 150, align: 'left', editable: true},
-                    {name: 'PRPTYDESC', width: 200, align: 'left', editable: true, edittype: 'textarea', editoptions: {rows: 2}},
+                    {name: 'PRPTY2VAL', width: 200, align: 'left', editable: true},
                     {
                         name: 'DELETEYN',
                         width: 20,
@@ -260,7 +258,6 @@
                 var data = new Object();
                 data["PRPTYNAME"] = $("input[name=prptyName]").val();
                 data["PRPTY2VAL"] = $("input[name=prpty2Val]").val();
-                data["PRPTYDESC"] = $("input[name=prptyDesc]").val();
 
                 var rows = $("#grid")[0].rows;
                 var index = Number($(rows[rows.length - 1]).attr("id"));
@@ -343,11 +340,6 @@
                 <td colspan="3"><input type="text" name="prpty2Val"/>
                 </td>
             </tr>
-            <tr>
-                <th>설명</th>
-                <td colspan="3"><input type="text" name="prptyDesc"/>
-                </td>
-            </tr>
         </table>
         <!-- grid -->
         <table id="grid"></table>

WebContent/jsp/onl/apim/portaluser/portalUserMan.jsp

@@ -29,16 +29,6 @@
         // 원본 행 데이터를 ID로 조회하기 위한 맵
         var gridRowDataMap = {};
 
-        // 휴대폰번호 중복 조회 모드 여부
-        var isDupView = false;
-
-        // 현재 검색조건 + 중복 조회 모드 플래그를 합쳐 LIST 요청 파라미터를 생성
-        function buildListPostData() {
-            var postData = getSearchForJqgrid("cmd", "LIST");
-            postData.onlyDuplicateMobile = isDupView;
-            return postData;
-        }
-
         /* 선택된 사용자 삭제 - 상태에 따라 Soft/Hard Delete 자동 분기 */
         function deleteSelectedUsers() {
             var selectedIds = $("#grid").jqGrid('getGridParam', 'selarrrow');
@@ -176,13 +166,6 @@
 
                     $('#grid').jqGrid('setColProp', 'approvalStatus', {editoptions: {value: select_approvalStatus}});
                     $('#grid').jqGrid('setColProp', 'userStatus', {editoptions: {value: select_userStatus}});
-
-                    // 휴대폰번호 중복 허용안함(기능 ON) + 중복 사용자 존재 시 배너 노출
-                    if (json.mobileDuplicateCheckEnabled && json.mobileDuplicateUserCount > 0) {
-                        $("#dupMobileCount").text(json.mobileDuplicateUserCount);
-                        $("#dupMobileBanner").show();
-                    }
-
                     $('#grid').trigger('reloadGrid');
 
                 },
@@ -193,7 +176,7 @@
         }
 
         $(document).ready(function () {
-            var gridPostData = buildListPostData();
+            var gridPostData = getSearchForJqgrid("cmd", "LIST");
 
             $('#grid').jqGrid({
                 datatype: "json",
@@ -205,7 +188,7 @@
                     '<%= localeMessage.getString("portalUser.orgName") %>',
                     '<%= localeMessage.getString("portalUser.name") %>',
                     '<%= localeMessage.getString("portalUser.userId") %>',
-                    '<%= localeMessage.getString("portalUser.mobileNumber") %>',
+                    <%--'<%= localeMessage.getString("portalUser.mobile") %>',--%>
                     '<%= localeMessage.getString("portalUser.roleName") %>',
                     '<%= localeMessage.getString("portalUser.userStatus") %>',
                     '<%= localeMessage.getString("portalUser.createOn") %>',
@@ -218,7 +201,7 @@
                     {name: 'portalOrgUIs.orgName', align: 'center', width: "120"},
                     {name: 'userName', align: 'center', width: "80" },
                     {name: 'loginId', align: 'center', width: "150" },
-                    {name: 'mobileNumber', align: 'center', width: "110", hidden: true},
+                    // {name: 'mobileNumber', align: 'center', width: "100" },
                     {name: 'roleCodeDescription', align: 'center', width: "80"},
                     {name: 'userStatusDescription', align: 'center', width: "50"},
                     {name: 'createdDate', align: 'center', width: "100", formatter: timeStampFormat},
@@ -291,20 +274,9 @@
             init();
 
             $("#btn_search").click(function () {
-                $("#grid").setGridParam({url: url, postData: buildListPostData(), page: 1}).trigger("reloadGrid");
-            });
+                var postData = getSearchForJqgrid("cmd", "LIST");
 
-            // 중복 휴대폰번호 사용자만 보기 / 전체 보기 토글
-            $("#btn_dup_toggle").click(function () {
-                isDupView = !isDupView;
-                if (isDupView) {
-                    $(this).text("전체 보기");
-                    $("#grid").jqGrid('showCol', 'mobileNumber');
-                } else {
-                    $(this).text("중복만 보기");
-                    $("#grid").jqGrid('hideCol', 'mobileNumber');
-                }
-                $("#grid").setGridParam({url: url, postData: buildListPostData(), page: 1}).trigger("reloadGrid");
+                $("#grid").setGridParam({url: url, postData: postData, page: 1}).trigger("reloadGrid");
             });
 
             $("#btn_new").click(function () {
@@ -347,11 +319,9 @@
             <button type="button" class="cssbtn" id="btn_new" level="W"><i
                     class="material-icons">add</i> <%= localeMessage.getString("button.new") %>
             </button>
-            <c:if test="${hardDeleteEnabled}">
             <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>
-            </c:if>
             <button type="button" class="cssbtn" id="btn_search" level="R"><i
                     class="material-icons">search</i> <%= localeMessage.getString("button.search") %>
             </button>
@@ -364,11 +334,6 @@
         </div>
         <% } %>
 
-        <div id="dupMobileBanner" style="display:none; background:#f8d7da; border:1px solid #dc3545; padding:8px 15px; margin:5px 0; border-radius:4px; color:#721c24;">
-            <strong>&#9888; 중복 휴대폰번호 사용자 <span id="dupMobileCount">0</span>건 발견</strong>
-            <button type="button" class="cssbtn" id="btn_dup_toggle" style="margin-left:10px;">중복만 보기</button>
-        </div>
-
         <table class="search_condition" cellspacing=0;>
             <tbody>
             <tr>
@@ -400,16 +365,15 @@
                 <td><input type="text" name="searchUserName"></td>
 
                 <th style="width:10%; min-width:100px;">
-                    <%= localeMessage.getString("portalUser.userId") %><span style="color:#dc3545;">(*)</span>
+                    <%= localeMessage.getString("portalUser.userId") %>
                 </th>
                 <td><input type="text" name="searchUserId" value="${param.searchUserId}"></td>
-                <th style="width:10%; min-width:100px;"><%= localeMessage.getString("portalUser.mobileNumber") %><span style="color:#dc3545;">(*)</span>
+                <th style="width:10%; min-width:100px;"><%= localeMessage.getString("portalUser.mobileNumber") %>
                 </th>
                 <td><input type="text" name="searchMobileNumber" value="${param.searchMobileNumber}"></td>
             </tr>
             </tbody>
         </table>
-        <div style="color:#dc3545; font-size:12px; margin:4px 2px;">(*) 암호화 항목 · 부분검색 불가(전체 일치)</div>
 
         <table id="grid"></table>
         <div id="pager"></div>

WebContent/jsp/onl/apim/portaluser/portalUserManDetail.jsp

@@ -165,10 +165,6 @@
                     $("#userStatus").val(data.userStatus);
                     $("#roleCode").val(data.roleCode).trigger('change');
                     $("#approvalStatus").val(data.approvalStatus);
-                    // 승인상태는 읽기전용(수정 불가) - 값은 그대로 제출되도록 disabled 대신 잠금 처리
-                    $("#approvalStatus")
-                            .css({'pointer-events':'none', 'background-color':'#eee'})
-                            .attr('tabindex', '-1');
 
                     // 탈퇴 상태 처리
                     if (originalUserStatus === STATUS.REMOVED) {
@@ -492,49 +488,29 @@
                     formData.push({name: 'mobileNumber', value: mobileNumber});
                 }
 
-                // cmd 및 사유(auditReason) 첨부 후 전송
-                function submitUser(cmd, auditReason) {
-                    formData.push({ name: 'cmd', value: cmd });
-                    // 감사로그(AUDIT_LOG) 발화를 위한 systemCode. 가입자 리포지토리는 고정 EMS 스키마라 스키마 전환 영향 없음
-                    formData.push({ name: 'serviceType', value: 'APIGW' });
-                    if (auditReason) {
-                        formData.push({ name: 'auditReason', value: auditReason });
+                formData.push({
+                    name: 'cmd',
+                    value: isDetail ? "UPDATE" : "INSERT"
+                });
+
+                if (!confirm("<%= localeMessage.getString("common.checkSave")%>")) return;
+
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: formData,
+                    success: function (json) {
+                        if (json.status === "fail") {
+                            alert(json.errorMsg || "저장에 실패했습니다.");
+                            return;
+                        }
+                        alert("<%= localeMessage.getString("common.saveMsg") %>");
+                        goNav(returnUrl);
+                    },
+                    error: function (e) {
+                        alert(e.responseText);
                     }
-
-                    $.ajax({
-                        type: "POST",
-                        url: url,
-                        data: formData,
-                        success: function (json) {
-                            if (json.status === "fail") {
-                                alert(json.errorMsg || "저장에 실패했습니다.");
-                                return;
-                            }
-                            alert("<%= localeMessage.getString("common.saveMsg") %>");
-                            goNav(returnUrl);
-                        },
-                        error: function (e) {
-                            alert(e.responseText);
-                        }
-                    });
-                }
-
-                if (isDetail) {
-                    // 수정: 상태를 REMOVED로 바꾼 경우 삭제(cmd=DELETE)로 감사 기록 + 익명화
-                    var targetCmd = ($("#userStatus").val() === 'REMOVED') ? "DELETE" : "UPDATE";
-                    var isRemove = (targetCmd === "DELETE");
-                    showReasonPrompt(
-                        isRemove ? "해당 가입자를 삭제(탈퇴) 처리합니다. 사유를 입력해 주세요." : "가입자 정보를 수정합니다. 사유를 입력해 주세요.",
-                        {
-                            title: isRemove ? "삭제 사유" : "수정 사유",
-                            onConfirm: function(reason) { submitUser(targetCmd, reason); }
-                        }
-                    );
-                } else {
-                    // 신규 등록: 사유 불필요
-                    if (!confirm("<%= localeMessage.getString("common.checkSave")%>")) return;
-                    submitUser("INSERT", null);
-                }
+                });
             });
 
             $("#btn_previous").click(function () {
@@ -542,26 +518,21 @@
             });
 
             $("#btn_delete").click(function () {
-                showReasonPrompt("해당 가입자를 삭제 처리합니다. 사유를 입력해 주세요.", {
-                    title: "삭제 사유",
-                    onConfirm: function(reason) {
-                        $.ajax({
-                            type: "POST",
-                            url: url,
-                            data: {
-                                cmd: "DELETE",
-                                id: $('input[name=id]').val(),
-                                serviceType: "APIGW",
-                                auditReason: reason
-                            },
-                            success: function () {
-                                alert("<%= localeMessage.getString("common.deleteMsg") %>");
-                                goNav(returnUrl);
-                            },
-                            error: function (e) {
-                                alert(e.responseText);
-                            }
-                        });
+                if (!confirm("<%= localeMessage.getString("common.confirmMsg")%>")) return;
+
+                $.ajax({
+                    type: "POST",
+                    url: url,
+                    data: {
+                        cmd: "DELETE",
+                        id: $('input[name=id]').val()
+                    },
+                    success: function () {
+                        alert("<%= localeMessage.getString("common.deleteMsg") %>");
+                        goNav(returnUrl);
+                    },
+                    error: function (e) {
+                        alert(e.responseText);
                     }
                 });
             });

WebContent/jsp/onl/apim/webhook/webhookSendLogMan.jsp

@@ -1,242 +0,0 @@
-<%@ 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");
-%>
-<html>
-<head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <jsp:include page="/jsp/common/include/css.jsp"/>
-    <jsp:include page="/jsp/common/include/script.jsp"/>
-    <style>
-        .url-cell { display:inline-block; max-width:380px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; vertical-align:middle; }
-        .succ-y { color:#1a73e8; font-weight:bold; }
-        .succ-n { color:#d93025; font-weight:bold; }
-    </style>
-    <script language="javascript">
-        var url = '<c:url value="/onl/apim/webhook/webhookSendLogMan.json" />';
-        var url_view = '<c:url value="/onl/apim/webhook/webhookSendLogMan.view" />';
-        var combo;
-		
-        function escapeHtmlJs(s) { return $('<div>').text(s == null ? '' : s).html(); }
-        function escapeAttr(s) { return escapeHtmlJs(s).replace(/"/g, '&quot;'); }
-
-        function formatTargetUrl(cellvalue, options, rowObject) {
-            var v = cellvalue || '';
-            return '<span class="url-cell" title="' + escapeAttr(v) + '">' + escapeHtmlJs(v) + '</span>';
-        }
-
-        // 이벤트유형 코드 → 모니터링 공통코드(EVENT_TYPE) 코드명
-        function formatEventType(cellvalue, options, rowObject) {
-            if (!combo || !combo.eventTypeList) {
-                return escapeHtmlJs(cellvalue);
-            }
-            for (var i = 0; i < combo.eventTypeList.length; i++) {
-                if (combo.eventTypeList[i].CODE == cellvalue) {
-                    return escapeHtmlJs(combo.eventTypeList[i].NAME);
-                }
-            }
-            return escapeHtmlJs(cellvalue);
-        }
-
-        function formatSuccess(cellvalue, options, rowObject) {
-            if (cellvalue === true) return '<span class="succ-y">성공</span>';
-            if (cellvalue === false) return '<span class="succ-n">실패</span>';
-            return '';
-        }
-
-
-        function init() {
-        	
-        	$("#startDatepicker").datepicker().inputmask("yyyy-mm-dd",{'autoUnmask':true});
-            $("#endDatepicker").datepicker().inputmask("yyyy-mm-dd",{'autoUnmask':true});
-            
-            var today = getToday();
-            
-            $("input[name=searchStartYYYYMMDD]").val(today.substring(0,6)+"01");
-            $("input[name=searchEndYYYYMMDD]").val(today);
-            $("input[name=searchStartDate]").val(today.substring(0,6)+"01");
-            $("input[name=searchEndDate]").val(today);
-            
-            $.ajax({
-                type: "POST", url: url, dataType: "json",
-                data: {cmd: 'LIST_INIT_COMBO'},
-                success: function (json) {
-                    combo = json;
-                    new makeOptions("CODE", "NAME").setObj($("select[name=searchEventType]"))
-                        .setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>")
-                        .setData(json.eventTypeList).rendering();
-
-                    // 뒤로가기 등으로 이전 검색조건 파라미터가 있으면 기본값을 덮어씀
-                    putSelectFromParam();
-
-                    // 콤보(이벤트유형) 로드 후 그리드 생성 — formatEventType 경합 방지
-                    buildGrid();
-                },
-                error: function (e) { alert(e.responseText); }
-            });
-        }
-
-        function buildGrid() {
-            $('#grid').jqGrid({
-                datatype: "json", 
-                mtype: 'POST', 
-                url: url,
-                postData: getSearchForJqgrid("cmd", "LIST"),
-                colNames: ['id', 'No.', '기관명', '이벤트유형', 'Target URL', 'Proxy URL', 'Status', '성공여부', '발송서버', '발송일시'],
-                colModel: [
-                    {name: 'id', align: 'center', key: true, hidden: true},
-                    {name: 'rowNum', align: 'center', width: 45, sortable: false},
-                    {name: 'orgName', align: 'left', width: 140},
-                    {name: 'eventType', align: 'center', width: 120, formatter: formatEventType},
-                    {name: 'targetUrl', align: 'left', width: 300, formatter: formatTargetUrl},
-                    {name: 'proxyUrl', align: 'left', width: 300, formatter: formatTargetUrl},
-                    {name: 'statusCode', align: 'center', width: 60},
-                    {name: 'success', align: 'center', width: 70, formatter: formatSuccess},
-                    {name: 'sendBy', align: 'center', width: 100},
-                    {name: 'sentAt', align: 'center', width: 140}
-                ],
-                jsonReader: {repeatitems: false},	
-                pager: $('#pager'),
-                page: '${param.page}',
-                rowNum: '${rmsDefaultRowNum}',
-                autoheight: true,
-                height: $("#container").height(),
-                autowidth: true,
-                viewrecords: true,
-                rowList: eval('[${rmsDefaultRowList}]'),
-                ondblClickRow: function (rowId) {
-                    var rowData = $(this).getRowData(rowId);
-                    var id = rowData['id'];
-                    var url2 = url_view + '?cmd=DETAIL';
-                    url2 += '&page=' + $(this).getGridParam("page");
-                    url2 += '&returnUrl=' + getReturnUrl();
-                    url2 += '&menuId=' + '${param.menuId}';
-                    url2 += '&id=' + id;
-                    url2 += '&' + getSearchUrl();
-                    goNav(url2);
-                },
-                loadComplete: function () {
-                    var page = $(this).getGridParam('page');
-                    var rowNum = $(this).getGridParam('rowNum');
-                    var rows = $(this).getDataIDs();
-                    var colModel = $(this).getGridParam("colModel");
-                    for (var i = 0; i < rows.length; i++) {
-                        var number = ((page - 1) * rowNum + i) + 1;
-                        $(this).setCell(rows[i], 'rowNum', number);
-                    }
-                    // 서버 고정 정렬(등록일시 역순) — 컬럼 정렬 비활성
-                    for (var i = 0; i < colModel.length; i++) {
-                        $(this).setColProp(colModel[i].name, {sortable: false});
-                    }
-                },
-                loadError: function (jqXHR, textStatus, errorThrown) {
-                    var location = '<%=request.getContextPath()%>/';
-                    comloadError(jqXHR, textStatus, errorThrown, location);
-                }
-            });
-            resizeJqGridWidth('grid', 'content_middle', '1000');
-        }
-
-        $(document).ready(function () {
-            init();
-
-            $("#btn_search").click(function () {
-                var start = $("input[name=searchStartYYYYMMDD]").val().replace(/-/gi, "");
-                var end = $("input[name=searchEndYYYYMMDD]").val().replace(/-/gi, "");
-
-                if (start && start > getToday()) {
-                    alert("시작일이 오늘 이후입니다. 시작일을 확인해주세요.");
-                    $("input[name=searchStartYYYYMMDD]").focus();
-                    return false;
-                }
-                if (start && end && start > end) {
-                    alert("조회기간 종료일은 시작일보다 커야합니다.");
-                    $("input[name=searchEndYYYYMMDD]").focus();
-                    return false;
-                }
-                $("input[name=searchStartDate]").val(start);
-                $("input[name=searchEndDate]").val(end);
-
-                var postData = getSearchForJqgrid("cmd", "LIST");
-                $("#grid").setGridParam({url: url, postData: postData, page: 1}).trigger("reloadGrid");
-            });
-
-            $("select[name^=search]").change(function () { $("#btn_search").click(); });
-            $("input[name^=search]").keydown(function (key) {
-                if (key.keyCode == 13) { $("#btn_search").click(); }
-            });
-
-            
-
-            buttonControl();
-        });
-    </script>
-</head>
-<body>
-<div class="right_box">
-    <div class="content_top">
-        <ul class="path"><li><a href="#">${rmsMenuPath}</a></li></ul>
-    </div><!-- end content_top -->
-    <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>
-        </div>
-        <div class="title">웹훅 발송 로그<span class="tooltip">외부로 발송된 웹훅 이력을 조회합니다.</span></div>
-        <form id="ajaxForm" onsubmit="return false;">
-            <table class="search_condition" cellspacing=0;>
-                <colgroup>
-                    <col style="width:120px;"><col style="width:200px;">
-                    <col style="width:120px;"><col style="width:200px;">
-                    <col style="width:120px;"><col style="width:200px;">
-                </colgroup>
-                <tbody>
-                <tr>
-                    <th>기관명</th>
-                    <td><input type="text" name="searchOrgName" autocomplete="off"></td>
-                    <th>이벤트유형</th>
-                    <td>
-                        <div class="select-style">
-                            <select name="searchEventType"></select>
-                        </div>
-                    </td>
-                    <th>성공여부</th>
-                    <td>
-                        <div class="select-style">
-                            <select name="searchSuccess">
-                                <option value="">전체</option>
-                                <option value="Y">성공</option>
-                                <option value="N">실패</option>
-                            </select>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <th>Target URL</th>
-                    <td><input type="text" name="searchTargetUrl" autocomplete="off" style="width:95%;"></td>
-                    <th>발송기간</th>
-                    <td>
-                        <input type="text" name="searchStartYYYYMMDD" id="startDatepicker" readonly="readonly" value="" size="10" style="width:40%; border:1px solid #ebebec;">
-                        ~
-                        <input type="text" name="searchEndYYYYMMDD" value="" id="endDatepicker" size="10" readonly="readonly" style="width:40%; border:1px solid #ebebec;">
-                        <input type="hidden" name="searchStartDate" value="">
-                        <input type="hidden" name="searchEndDate" value="">
-                    </td>
-                    <th></th>
-                    <td></td>
-                </tr>
-                </tbody>
-            </table>
-        </form>
-        <table id="grid"></table>
-        <div id="pager"></div>
-    </div><!-- end content_middle -->
-</div><!-- end right_box -->
-</body>
-</html>

WebContent/jsp/onl/apim/webhook/webhookSendLogManDetail.jsp

@@ -1,137 +0,0 @@
-<%@ 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");
-%>
-<html>
-<head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <jsp:include page="/jsp/common/include/css.jsp"/>
-    <jsp:include page="/jsp/common/include/script.jsp"/>
-    <style>
-        .succ-y { color:#1a73e8; font-weight:bold; }
-        .succ-n { color:#d93025; font-weight:bold; }
-        .pre-wrap { white-space:pre-wrap; word-break:break-all; min-height:60px; line-height:1.5; }
-    </style>
-    <script language="javascript">
-        var url = '<c:url value="/onl/apim/webhook/webhookSendLogMan.json" />';
-        var url_view = '<c:url value="/onl/apim/webhook/webhookSendLogMan.view" />';
-        var key = '${param.id}';
-
-        function escapeHtmlJs(s) { return $('<div>').text(s == null ? '' : s).html(); }
-
-        function detail() {
-            if (!key) return;
-            $.ajax({
-                type: "POST", url: url, dataType: "json",
-                data: {cmd: 'DETAIL', id: key},
-                success: function (data) {
-                    $('#id').text(data.id != null ? data.id : '');
-                    $('#orgName').text(data.orgName || '');
-                    $('#eventType').text(data.eventTypeName || data.eventType || '')
-                        .attr('title', data.eventType || '');
-                    $('#targetUrl').text(data.targetUrl || '');
-                    $('#proxyUrl').text(data.proxyUrl || '');
-                    $('#statusCode').text(data.statusCode != null ? data.statusCode : '');
-                    $('#retryCount').text(data.retryCount != null ? data.retryCount : '');
-                    $('#sendBy').text(data.sendBy || '');
-                    $('#sentAt').text(data.sentAt || '');
-                    $('#signature').text(data.signature || '');
-                    $('#errorMessage').text(data.errorMessage || '');
-                    $('#payload').text(data.payload || '');
-                    $('#responseBody').text(data.responseBody || '');
-
-                    if (data.success === true) {
-                        $('#success').html('<span class="succ-y">성공</span>');
-                    } else if (data.success === false) {
-                        $('#success').html('<span class="succ-n">실패</span>');
-                    } else {
-                        $('#success').text('');
-                    }
-                },
-                error: function (e) { alert(e.responseText); }
-            });
-        }
-
-        $(document).ready(function () {
-            var returnUrl = getReturnUrlForReturn();
-
-            buttonControl();
-            detail();
-
-            $('#btn_previous').click(function () { goNav(returnUrl); });
-        });
-    </script>
-</head>
-<body>
-<div class="right_box">
-    <div class="content_top">
-        <ul class="path"><li><a href="#">${rmsMenuPath}</a></li></ul>
-    </div>
-    <div class="content_middle">
-        <div class="search_wrap">
-            <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>
-        <table class="table_row" cellspacing="0">
-            <colgroup>
-                <col style="width:12%"/><col style="width:38%"/>
-                <col style="width:12%"/><col style="width:38%"/>
-            </colgroup>
-            <tr>
-                <th>ID</th>
-                <td><span id="id"></span></td>
-                <th>기관명</th>
-                <td><span id="orgName"></span></td>
-            </tr>
-            <tr>
-                <th>이벤트유형</th>
-                <td><span id="eventType"></span></td>
-                <th>Status Code</th>
-                <td><span id="statusCode"></span></td>
-            </tr>
-            <tr>
-                <th>Target URL</th>
-                <td><span id="targetUrl"></span></td>
-                <th>Proxy URL</th>
-                <td><span id="proxyUrl"></span></td>
-            </tr>
-            <tr>
-                <th>성공여부</th>
-                <td><span id="success"></span></td>
-                <th>재시도횟수</th>
-                <td><span id="retryCount"></span></td>
-            </tr>
-            <tr>
-                <th>발송서버</th>
-                <td><span id="sendBy"></span></td>
-                <th>발송일시</th>
-                <td><span id="sentAt"></span></td>
-            </tr>
-            <tr>
-                <th>Signature</th>
-                <td colspan="3"><span id="signature"></span></td>
-            </tr>
-            <tr>
-                <th>Payload</th>
-                <td colspan="3"><div id="payload" class="pre-wrap"></div></td>
-            </tr>
-            <tr>
-                <th>Response Body</th>
-                <td colspan="3"><div id="responseBody" class="pre-wrap"></div></td>
-            </tr>
-            <tr>
-                <th>에러 메세지</th>
-                <td colspan="3"><div id="errorMessage" class="pre-wrap"></div></td>
-            </tr>
-        </table>
-    </div>
-</div>
-</body>
-</html>

WebContent/jsp/onl/kjb/statistics/apiStatsMinuteMan.jsp

@@ -525,26 +525,35 @@
 			$("input[name=searchStartDate], input[name=searchEndDate]").inputmask("9999-99-99", { 'autoUnmask': true });
 			$("input[name=searchStartTime], input[name=searchEndTime]").inputmask("99:99", { 'autoUnmask': true });
 
-			// 기본값 설정 (현재 시간(분) 기준 1시간 전 ~ 현재 시간(분))
+			// 기본값 설정 (현재 시간 기준 1시간 전 정각 ~ 현재 정각)
 			var now = new Date();
-			var oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
+			var endHour = now.getHours();
+			var startHour = endHour - 1;
+			var startDate, endDate;
 
-			function formatDate(d) {
-				return d.getFullYear() + '-' +
-					String(d.getMonth() + 1).padStart(2, '0') + '-' +
-					String(d.getDate()).padStart(2, '0');
-			}
-			function formatTime(d) {
-				return String(d.getHours()).padStart(2, '0') + ':' + String(d.getMinutes()).padStart(2, '0');
+			if (startHour < 0) {
+				startHour = 23;
+				var yesterday = new Date(now);
+				yesterday.setDate(yesterday.getDate() - 1);
+				startDate = yesterday.getFullYear() + '-' +
+					String(yesterday.getMonth() + 1).padStart(2, '0') + '-' +
+					String(yesterday.getDate()).padStart(2, '0');
+				endDate = now.getFullYear() + '-' +
+					String(now.getMonth() + 1).padStart(2, '0') + '-' +
+					String(now.getDate()).padStart(2, '0');
+			} else {
+				var today = getToday();
+				startDate = today;
+				endDate = today;
 			}
 
 			if (!$("input[name=searchStartDate]").val()) {
-				$("input[name=searchStartDate]").val(formatDate(oneHourAgo));
-				$("input[name=searchStartTime]").val(formatTime(oneHourAgo));
+				$("input[name=searchStartDate]").val(startDate);
+				$("input[name=searchStartTime]").val(String(startHour).padStart(2, '0') + ':00');
 			}
 			if (!$("input[name=searchEndDate]").val()) {
-				$("input[name=searchEndDate]").val(formatDate(now));
-				$("input[name=searchEndTime]").val(formatTime(now));
+				$("input[name=searchEndDate]").val(endDate);
+				$("input[name=searchEndTime]").val(String(endHour).padStart(2, '0') + ':00');
 			}
 
 			initCharts();

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

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

WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp

@@ -77,17 +77,13 @@
 		    display: inline-block;
 		    vertical-align: middle;
 		}
-
-		/* iframe 모달(showModal) 콘텐츠 패딩 제거 — iframe 이 다이얼로그 폭을 최대한 사용해 내부 가로스크롤 방지 */
-		.ui-dialog .ui-dialog-content { padding: 0 !important; }
-
+		
     </style>
     <script language="javascript" >
         var isDetail = false;
         var url ='<c:url value="/onl/transaction/apim/apiInterfaceMan.json" />';
         const url_excel  ='<c:url value="/onl/transaction/apim/apiInterfaceMan.excel" />';
         var url_spec = '<c:url value="/onl/transaction/apim/apiSpecMan.view"/>';
-        var url_openapi_spec = '<c:url value="/onl/transaction/apim/djbApiSpecMan.view"/>';
         var returnUrl ;
         let headerValues = [];
         let headerNames = [];
@@ -302,7 +298,7 @@
             if(!isStandardMessage){
                 $(adapterSettings.adapterUrlId).text(adapterInfo.urlPath);
             } else {
-                //$(adapterSettings.methodSelectId).val('');
+                $(adapterSettings.methodSelectId).val('');
                 $(adapterSettings.restPathInputId).val('');
                 $(adapterSettings.adapterUrlId).text('');
             }
@@ -490,7 +486,6 @@
                     }
 
                     if(data.errResponseTransform != null && data.errResponseTransform != '' && data.errTransformYn == 'Y') {
-                    	$('#toggleTransformYn').bootstrapToggle('on');
                         $('#toggleErrTransformYn').bootstrapToggle('on');
                         $('#rowErrResponseTransform').show();
                     } else {
@@ -876,10 +871,6 @@
 			});
 			
             var postData = $('#ajaxForm').serializeArray();
-            
-            console.log('modify', postData);
-            console.log('method', $('#inboundHttpMethod').val());
-            
             if (isDetail){
                 postData.push({ name: "cmd" , value:"UPDATE"});
             }else{
@@ -997,33 +988,6 @@
             showModal(popupUrl, args, 1200, 800);
         }
 
-        // v2: OpenAPI Spec — 기본은 모달(iframe), Shift+클릭은 새 창.
-        // 컨텍스트는 전부 query string 으로 전달(dialogArguments 미사용).
-        function showOpenApiSpecPopup(e) {
-            var eaiSvcName  = getFullSvcName();
-            var eaiSvcDesc  = $('#eaiSvcDesc').val();
-            var apipath     = $('#apiFullPath').val();   // METHOD|URL ('|' 포함 → 인코딩 필수)
-            var contentType = $('#contentType').val();
-            var baseUrl = url_openapi_spec
-                + '?cmd=DETAIL'
-                + '&eaiSvcName='  + encodeURIComponent(eaiSvcName)
-                + '&apipath='     + encodeURIComponent(apipath)
-                + '&eaiSvcDesc='  + encodeURIComponent(eaiSvcDesc)
-                + '&contentType=' + encodeURIComponent(contentType);
-            if (e && e.shiftKey) {
-                // Shift+클릭: 새 창. window.open 은 serviceType/menuId 자동 부착 안 되므로 직접 붙임.
-                window.open(urlAddServiceType(baseUrl + '&menuId=' + encodeURIComponent(getMenuId())), '_blank');
-            } else {
-                // 기본: 모달 + iframe. showModal 이 serviceType/menuId/pop 을 자동 부착.
-                // 콘텐츠 고정폭 1600 + 다이얼로그 chrome(패딩/보더 ~40px) 때문에 iframe 내부폭이 1600 미만이면 가로스크롤 발생.
-                // 뷰포트 내에서 최대한 크게 열어(캡 1720) iframe 내부폭이 1600 이상 확보되게 한다.
-                var vw = $(window).width(), vh = $(window).height();
-                var modalW = Math.min(vw - 12, 1720);
-                var modalH = Math.min(vh - 20, 900);
-                showModal(baseUrl, { title: 'OpenAPI Spec' }, modalW, modalH);
-            }
-        }
-
         $(document).ready(function() {
             makeValidate();
             // var bootstrapButton = $.fn.button.noConflict()
@@ -1038,14 +1002,9 @@
             }
             init(url,key,detail);
 
-            // v1: 기존 API 스펙 (모달) — 기능 비교용 복원
             $("#btn_api_spec").click(function() {
                 showApiSpecPopup();
             });
-            // v2: 신규 OpenAPI Spec (새 탭)
-            $("#btn_openapi_spec").click(function(e) {
-                showOpenApiSpecPopup(e);
-            });
 
             $("#btn_modify").click(modifyApi);
             $("#btn_delete").click(function(){
@@ -1544,10 +1503,7 @@
             <button type="button" class="cssbtn" id="btn_json_export" level="R" status="DETAIL,NEW"><i class="material-icons">download</i> <%=localeMessage.getString("button.exportJson")%></button></button>
             <button type="button" class="cssbtn" id="btn_delete" level="W" status="DETAIL"><i class="material-icons">delete</i> <%= localeMessage.getString("button.delete") %></button>
             <button type="button" class="cssbtn" id="btn_modify" level="R" status="DETAIL,NEW"><i class="material-icons">save</i> <%= localeMessage.getString("button.modify") %></button>
-            <!-- v1: 기존 API 스펙 (모달) — 기능 비교용 복원 -->
-            <button type="button" class="cssbtn" id="btn_api_spec" level="R" status="DETAIL,NEW"><i class="material-icons">description</i> API 스펙(삭제예정)</button>
-            <!-- v2: 신규 OpenAPI Spec (새 탭) -->
-            <button type="button" class="cssbtn" id="btn_openapi_spec" level="R" status="DETAIL,NEW"><i class="material-icons">api</i> OpenAPI Spec</button>
+            <button type="button" class="cssbtn" id="btn_api_spec" level="R" status="DETAIL,NEW"><i class="material-icons">description</i> API 스펙</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" id="title" style="font-size:1.4em">${rmsMenuName}</div>
@@ -1730,7 +1686,7 @@
                                     <option value="none" selected>NONE</option>
                                     <option value="oauth">OAUTH</option>
                                     <option value="api_key">API_KEY</option>
-                                    <!-- <option value="ca">CA</option> -->
+                                    <option value="ca">CA</option>
                                 </select>
                             </div>
                         </div>

WebContent/jsp/onl/transaction/apim/apiSpecManPopup.jsp

@@ -23,7 +23,7 @@
     </style>
     <script language="javascript">
         var url = '<c:url value="/onl/transaction/apim/apiSpecMan.json" />';
-        var url_org ='<c:url value="/onl/transaction/apim/apiSpecMan.view" />';
+        var url_org ='<c:url value="/onl/transaction/apim/apiSpecManPopup.view" />';
         var isDetail = false;
         var sampleRequestEditor, sampleResponseEditor, testbedSpecEditor;
 

WebContent/jsp/onl/transaction/apim/djbApiGroupPopup.jsp

@@ -1,132 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=utf-8"%>
-<%@ page import="java.io.*"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ include file="/jsp/common/include/localemessage.jsp" %>
-<%
-    response.setHeader("Pragma", "No-cache");
-    response.setHeader("Cache-Control", "no-cache");
-    response.setHeader("Expires", "0");
-%>
-<html>
-<head>
-    <title>API 그룹 선택</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <jsp:include page="/jsp/common/include/css_custom.jsp"/>
-    <jsp:include page="/jsp/common/include/css.jsp"/>
-    <jsp:include page="/jsp/common/include/script.jsp"/>
-    <script language="javascript">
-        var url = '<c:url value="/onl/apim/apigroup/apiGroupMan.json" />';
-
-        function search() {
-            var postData = getSearchForJqgrid("cmd", "LIST");
-            $("#grid").setGridParam({url: url, postData: postData, page: 1}).trigger("reloadGrid");
-        }
-
-        $(document).ready(function() {
-            var urlParams = new URLSearchParams(window.location.search);
-            var selectedGroupIds = urlParams.get("selectedGroupIds");
-
-            if (selectedGroupIds) {
-                selectedGroupIds = selectedGroupIds.split(','); // 콤마로 구분된 ID들을 배열로 변환
-            } else {
-                selectedGroupIds = [];
-            }
-
-            $('#grid').jqGrid({
-                datatype: "json",
-                mtype: 'POST',
-                url: url,
-                postData: getSearchForJqgrid("cmd", "LIST"),
-                colNames: ['API 그룹 ID', 'API 그룹 명', '설명'],
-                colModel: [
-                    {name: 'id', hidden: true},
-                    {name: 'groupName', align: 'center', width: "180"},
-                    {name: 'groupDesc', align: 'left', width: "200"}
-                ],
-                jsonReader: {
-                    repeatitems: false
-                },
-                pager: $('#pager'),
-                page: '${param.page}',
-                rowNum: '${rmsDefaultRowNum}',
-                autoheight: true,
-                height: 'auto',
-                width: 410,
-                autowidth: false,
-                viewrecords: true,
-                shrinkToFit: false,
-                multiselect: true,
-                multiboxonly: false,
-                loadComplete: function(data) {
-                    var $grid = $(this);
-                    $.each($grid.getDataIDs(), function(_, id) {
-                        var rowData = $grid.getRowData(id);
-                        if ($.inArray(rowData.id, selectedGroupIds) !== -1) {
-                            $grid.jqGrid('setSelection', id, true);
-                        }
-                    });
-                }
-            });
-
-            $("#btn_search").click(search);
-
-            $("#btn_save").click(function() {
-                var selectedRows = $('#grid').getGridParam('selarrrow');
-
-                var selectedGroups = [];
-                if (selectedRows.length > 0) {
-                    selectedGroups = selectedRows.map(function(rowid) {
-                        var rowData = $('#grid').getRowData(rowid);
-                        return {
-                            id: rowData.id,
-                            groupName: rowData.groupName
-                        };
-                    });
-                }
-                // 부모 창의 selectApiGroup 함수 호출
-                if (window.parent && typeof window.parent.selectApiGroup === "function") {
-                    window.parent.selectApiGroup(selectedGroups);
-                    window.close();
-                }
-            });
-
-            $("#btn_close").click(function () {
-                window.close();
-            });
-
-            // 검색어 입력 후 엔터 키 처리
-            $("input[name=searchGroupName]").keydown(function(key) {
-                if (key.keyCode == 13) {
-                    search();
-                }
-            });
-        });
-    </script>
-</head>
-<body>
-<div class="popup_box">
-    <div class="search_wrap">
-        <button type="button" class="cssbtn" id="btn_save" level="W">
-            <i class="material-icons">save</i> <%= localeMessage.getString("button.save") %>
-        </button>
-        <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_close" level="R" status="DETAIL"><i
-                class="material-icons">close</i> <%= localeMessage.getString("button.close") %>
-        </button>
-    </div>
-    <div class="title"></div>
-    <table class="search_condition" cellspacing="0">
-        <tr>
-            <th style="width:80px;">API 그룹 명</th>
-            <td>
-                <input type="text" name="searchGroupName" value="${param.searchGroupName}">
-            </td>
-        </tr>
-    </table>
-    <table id="grid"></table>
-    <div id="pager"></div>
-</div>
-</body>
-</html>

WebContent/jsp/onl/transaction/apim/djbApiSpecManPopup.jsp

@@ -1,173 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=utf-8" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%
-    response.setHeader("Pragma", "No-cache");
-    response.setHeader("Cache-Control", "no-cache");
-    response.setHeader("Expires", "0");
-%>
-<!doctype html>
-<html lang="ko">
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=1600" />
-  <title>OpenAPI Spec 에디터</title>
-
-  <%-- Tailwind (벤더된 Play CDN JS, 오프라인) --%>
-  <script src="<c:url value='/plugins/openapi/tailwind.js'/>"></script>
-  <script>
-    tailwind.config = { theme: { extend: { colors: { brand: {
-      50:'#eff6ff', 100:'#dbeafe', 500:'#3b82f6', 600:'#2563eb', 700:'#1d4ed8'
-    } } } } };
-  </script>
-
-  <%-- Swagger UI 5 (벤더) --%>
-  <link rel="stylesheet" href="<c:url value='/plugins/swaggerUI/swagger-ui.css'/>" />
-  <script src="<c:url value='/plugins/swaggerUI/swagger-ui-bundle.js'/>"></script>
-  <script src="<c:url value='/plugins/swaggerUI/swagger-ui-standalone-preset.js'/>"></script>
-  <script src="<c:url value='/plugins/swaggerUI/djb-swagger-i18n.js'/>" charset="UTF-8"></script>
-
-  <%-- js-yaml (벤더) --%>
-  <script src="<c:url value='/plugins/openapi/js-yaml.min.js'/>"></script>
-
-  <%-- CodeMirror (YAML 편집기 — Monaco 대체, admin addon) --%>
-  <link rel="stylesheet" href="<c:url value='/addon/codemirror/lib/codemirror.css'/>" />
-  <script src="<c:url value='/addon/codemirror/lib/codemirror.js'/>"></script>
-  <script src="<c:url value='/addon/codemirror/mode/yaml/yaml.js'/>"></script>
-  <script src="<c:url value='/addon/codemirror/mode/javascript/javascript.js'/>"></script>
-
-  <%-- jQuery + Summernote(lite, 무-Bootstrap) — 설명 리치 에디터 --%>
-  <link rel="stylesheet" href="<c:url value='/addon/summernote/summernote-lite.css'/>" />
-  <%-- 개발자포탈과 동일한 에디터 콘텐츠 스타일(.editor-content, Noto Sans KR 16px) --%>
-  <link rel="stylesheet" href="<c:url value='/js/djb/apispec/editor-content.css'/>" />
-  <script src="<c:url value='/js/jquery-1.12.1.min.js'/>"></script>
-  <script src="<c:url value='/addon/summernote/summernote-lite.min.js'/>"></script>
-  <script src="<c:url value='/addon/summernote/lang/summernote-ko-KR.js'/>"></script>
-
-  <link rel="stylesheet" href="<c:url value='/js/djb/apispec/styles.css'/>" />
-  <style>
-    /* 페이지 자체 세로 스크롤 제거 — 뷰포트 고정, 내부 패널만 스크롤 */
-    html, body { height: 100%; margin: 0; overflow-x: auto; overflow-y: hidden; }
-    #djb-wrap { height: 100vh; display: flex; flex-direction: column; }
-    #djb-wrap > header, #djb-wrap > nav { flex: 0 0 auto; }
-    #body { flex: 1 1 auto; min-height: 0 !important; overflow: hidden; }
-    #form-panel { display: flex; flex-direction: column; min-height: 0; overflow: hidden; }
-    #form-content { flex: 1 1 auto; min-height: 0; overflow-y: auto; }
-    #preview-panel { display: flex; flex-direction: column; min-height: 0; overflow: hidden; }
-    #preview-swagger, #preview-monaco { flex: 1 1 auto; min-height: 0; height: auto !important; overflow: auto; }
-    #preview-monaco .CodeMirror { height: 100%; }
-    /* 패널 내부 sticky 는 flex 행으로 (스크롤 컨테이너는 form-content / preview) */
-    #form-panel > .sticky, #preview-panel > .sticky { position: static !important; }
-  </style>
-
-  <script>
-    window.DJB_CTX = {
-      eaiSvcName: "${param.eaiSvcName}",
-      apiName: "${param.eaiSvcDesc}",
-      detailUrl: "<c:url value='/onl/transaction/apim/djbApiSpecMan.json'/>?cmd=DETAIL_SPEC&serviceType=APIGW",
-      saveUrl:   "<c:url value='/onl/transaction/apim/djbApiSpecMan.json'/>?cmd=SAVE&serviceType=APIGW",
-      swaggerBase: "<c:url value='/plugins/swaggerUI/'/>",
-      gwAddress: "${gwAddress}",
-      orgPopupUrl: "<c:url value='/onl/transaction/apim/apiSpecMan.view'/>",
-      groupPopupUrl: "<c:url value='/onl/transaction/apim/djbApiSpecMan.view'/>?cmd=GROUP_POPUP",
-      jsonUrl: "<c:url value='/onl/transaction/apim/djbApiSpecMan.json'/>"
-    };
-  </script>
-</head>
-<body class="bg-slate-50 text-slate-800 antialiased" style="min-width:1600px;">
-
-  <div id="djb-wrap" class="mx-auto" style="width:1600px;">
-
-    <!-- ===== Header ===== -->
-    <header class="h-14 flex items-center justify-between px-6 bg-white border-b border-slate-200 sticky top-0 z-30">
-      <div class="flex items-center gap-3">
-        <div class="font-semibold text-slate-900">OpenAPI Spec 에디터</div>
-        <span class="text-slate-300">|</span>
-        <span class="text-sm text-slate-500">인터페이스:</span>
-        <span class="text-sm font-medium text-slate-800" id="hdr-project-name">${param.eaiSvcName}</span>
-        <span class="ml-2 px-2 py-0.5 text-[11px] rounded-full bg-slate-100 text-slate-600 border border-slate-200" id="hdr-version">v1.0.0</span>
-        <span id="hdr-source" class="hidden ml-1 px-2 py-0.5 text-[11px] rounded-full bg-emerald-50 text-emerald-700 border border-emerald-200"></span>
-      </div>
-      <div class="flex items-center gap-2">
-        <button id="btn-newwin" class="hidden px-3 py-1.5 text-sm rounded border border-slate-300 bg-white hover:bg-slate-50">새창으로 띄우기</button>
-        <button id="btn-regen" class="px-3 py-1.5 text-sm rounded border border-slate-300 bg-white hover:bg-slate-50">자동 생성(초기화)</button>
-        <button id="btn-save" class="px-3 py-1.5 text-sm rounded bg-emerald-600 text-white hover:bg-emerald-700">저장</button>
-        <div class="relative">
-          <button id="btn-export" class="px-3 py-1.5 text-sm rounded bg-brand-600 text-white hover:bg-brand-700">내보내기 ▾</button>
-          <div id="export-menu" class="hidden absolute right-0 mt-1 w-44 bg-white border border-slate-200 rounded shadow-lg z-40">
-            <button data-export="yaml" class="block w-full text-left px-3 py-2 text-sm hover:bg-slate-50">YAML 다운로드</button>
-            <button data-export="json" class="block w-full text-left px-3 py-2 text-sm hover:bg-slate-50">JSON 다운로드</button>
-          </div>
-        </div>
-        <button id="btn-close" class="px-3 py-1.5 text-sm rounded border border-slate-300 bg-white hover:bg-slate-50">닫기</button>
-      </div>
-    </header>
-
-    <!-- ===== Stepper ===== -->
-    <nav class="bg-white border-b border-slate-200 sticky z-20" style="top:56px;">
-      <div class="h-1 bg-slate-100">
-        <div id="stepper-progress" class="h-1 bg-brand-500 transition-all duration-300" style="width:16.66%"></div>
-      </div>
-      <ol id="stepper" class="grid grid-cols-5 px-2"></ol>
-    </nav>
-
-    <!-- ===== Body ===== -->
-    <main id="body" class="flex" style="min-height: calc(100vh - 56px - 72px);">
-      <section id="form-panel" class="bg-white border-r border-slate-200 transition-all duration-300" style="width:960px;">
-        <div class="flex items-center justify-between px-6 py-3 border-b border-slate-100 sticky bg-white z-10" style="top:128px;">
-          <div class="flex items-baseline gap-3">
-            <span class="text-xs uppercase tracking-wide text-slate-400">Step <span id="form-step-num">1</span> / 5</span>
-            <h2 class="text-base font-semibold text-slate-800" id="form-step-title">기본정보</h2>
-          </div>
-          <button id="btn-toggle-preview-from-form" class="hidden text-xs px-2 py-1 rounded border border-slate-200 text-slate-600 hover:bg-slate-50">▶ 미리보기 다시 열기</button>
-        </div>
-        <div id="form-content" class="px-6 py-5"></div>
-        <div class="sticky bottom-0 bg-white border-t border-slate-200 px-6 py-3 flex items-center justify-between">
-          <button id="btn-prev" class="px-4 py-2 text-sm rounded border border-slate-300 bg-white hover:bg-slate-50 disabled:opacity-40 disabled:cursor-not-allowed">◀ 이전</button>
-          <div class="text-xs text-slate-500" id="footer-hint">필수 항목을 채우고 다음 단계로 이동하세요</div>
-          <button id="btn-next" class="px-4 py-2 text-sm rounded bg-brand-600 text-white hover:bg-brand-700">다음 ▶</button>
-        </div>
-      </section>
-
-      <aside id="preview-panel" class="bg-slate-50 transition-all duration-300" style="width:640px;">
-        <div class="flex items-center justify-between px-4 py-2 border-b border-slate-200 bg-white sticky z-10" style="top:128px;">
-          <div class="flex items-center gap-1">
-            <button data-ptab="swagger" class="preview-tab px-3 py-1.5 text-sm rounded-t border-b-2 border-brand-600 text-brand-700 font-medium">Swagger UI</button>
-            <button data-ptab="yaml-ro" class="preview-tab px-3 py-1.5 text-sm rounded-t border-b-2 border-transparent text-slate-600 hover:text-slate-800">YAML 보기</button>
-            <button data-ptab="yaml-edit" class="preview-tab px-3 py-1.5 text-sm rounded-t border-b-2 border-transparent text-slate-600 hover:text-slate-800">스펙 편집</button>
-          </div>
-          <button id="btn-toggle-preview" class="text-xs px-2 py-1 rounded border border-slate-200 text-slate-600 hover:bg-slate-100">패널 숨기기 ▶</button>
-        </div>
-        <div id="yaml-edit-bar" class="hidden flex items-center justify-between bg-amber-50 border-b border-amber-200 px-4 py-2 text-xs">
-          <span class="text-amber-800">YAML 을 직접 편집한 뒤 [Form 에 적용] 을 눌러 양식에 동기화하세요.</span>
-          <div class="flex items-center gap-2">
-            <button id="btn-yaml-revert" class="px-2 py-1 rounded border border-amber-300 bg-white hover:bg-amber-100">변경 취소</button>
-            <button id="btn-yaml-apply"  class="px-2 py-1 rounded bg-amber-600 text-white hover:bg-amber-700">Form 에 적용</button>
-          </div>
-        </div>
-        <div id="preview-swagger" class="overflow-auto" style="height: calc(100vh - 56px - 72px - 41px);"></div>
-        <div id="preview-monaco" class="hidden" style="height: calc(100vh - 56px - 72px - 41px);"></div>
-      </aside>
-    </main>
-  </div>
-
-  <div id="toast" class="fixed bottom-5 left-1/2 -translate-x-1/2 hidden px-4 py-2 rounded bg-slate-900 text-white text-sm shadow-lg z-50"></div>
-
-  <!-- Security scheme modal -->
-  <div id="sec-modal" class="hidden fixed inset-0 z-50 bg-slate-900/40 flex items-center justify-center">
-    <div class="bg-white rounded-lg shadow-xl w-[640px] max-h-[80vh] overflow-auto">
-      <div class="flex items-center justify-between px-5 py-3 border-b border-slate-200">
-        <h3 class="font-semibold text-slate-800">보안 스킴 추가</h3>
-        <button class="text-slate-400 hover:text-slate-700" data-sec-close>✕</button>
-      </div>
-      <div class="p-5" id="sec-modal-body"></div>
-      <div class="px-5 py-3 border-t border-slate-200 flex justify-end gap-2 bg-slate-50">
-        <button class="px-3 py-1.5 text-sm rounded border border-slate-300 bg-white" data-sec-close>취소</button>
-        <button id="btn-sec-save" class="px-3 py-1.5 text-sm rounded bg-brand-600 text-white">추가</button>
-      </div>
-    </div>
-  </div>
-
-  <script src="<c:url value='/js/djb/apispec/sample-data.js'/>"></script>
-  <script src="<c:url value='/js/djb/apispec/app.js'/>"></script>
-</body>
-</html>

WebContent/plugins/swaggerUI/djb-swagger-i18n.js

@@ -1,122 +0,0 @@
-/*!
- * djb-swagger-i18n.js
- *  Swagger UI 영문 라벨을 한글로 치환하는 i18n 패치 (방법 B - DOM patch)
- *  배포 경로 권장: static/plugins/swaggerUI/djb-swagger-i18n.js
- *  index.html 의 swagger-initializer.js 직전 또는 직후에 <script> 로 로드
- *
- *  ?lang=en 쿼리스트링이 있으면 패치 비활성화 (원문 보기)
- *  매핑 카탈로그는 01-i18n-mapping/i18n-strings.csv 와 동기 유지
- */
-(function (window) {
-  'use strict';
-
-  // ── 비활성화 옵션 ──
-  if (/[?&]lang=en\b/.test(window.location.search)) return;
-
-  // ── 매핑 (key 는 디버깅용, 실제 비교는 EN 문자열 일치) ──
-  var I18N_MAP = {
-    // P0 — OAuth2 모달 본문
-    'auth.modal.title':          { en: 'Available authorizations', ko: '사용 가능한 인증' },
-    'auth.scopes.description':   {
-      en: 'Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.',
-      ko: '스코프는 최종 사용자를 대신하여 애플리케이션이 데이터에 접근할 수 있는 권한 수준을 부여합니다. 각 API는 하나 이상의 스코프를 선언할 수 있습니다.'
-    },
-    'auth.scopes.swagger_grant': {
-      en: 'API requires the following scopes. Select which ones you want to grant to Swagger UI.',
-      ko: '이 API 는 아래 스코프가 필요합니다. Swagger UI 에 부여할 스코프를 선택하세요.'
-    },
-    'auth.flow.clientCredentials': { en: 'OAuth2 client credentials flow', ko: 'OAuth2 클라이언트 자격증명 흐름' },
-    'auth.flow.implicit':          { en: 'OAuth2 implicit flow',           ko: 'OAuth2 암묵적 흐름' },
-    'auth.flow.password':          { en: 'OAuth2 password flow',           ko: 'OAuth2 비밀번호 흐름' },
-    'auth.flow.authorizationCode': { en: 'OAuth2 authorization code flow', ko: 'OAuth2 인가 코드 흐름' },
-    'auth.field.tokenUrl':         { en: 'Token URL:',    ko: '토큰 URL:' },
-    'auth.field.flow':             { en: 'Flow:',         ko: '흐름:' },
-    'auth.field.clientId':         { en: 'client_id:',    ko: '클라이언트 ID (client_id):' },
-    'auth.field.clientSecret':     { en: 'client_secret:',ko: '클라이언트 시크릿 (client_secret):' },
-    'auth.field.scopes':           { en: 'Scopes:',       ko: '스코프:' },
-    'auth.action.selectAll':       { en: 'select all',    ko: '모두 선택' },
-    'auth.action.selectNone':      { en: 'select none',   ko: '선택 해제' },
-    'auth.action.authorize':       { en: 'Authorize',     ko: '인증' },
-    'auth.action.close':           { en: 'Close',         ko: '닫기' },
-    'auth.action.logout':          { en: 'Logout',        ko: '로그아웃' },
-    'auth.modal.authorized':       { en: 'authorized',    ko: '인증됨' },
-
-    // P1 — 기타 인증 흐름
-    'auth.scheme.apiKey':          { en: 'API key',  ko: 'API 키' },
-    'auth.field.name':             { en: 'name:',    ko: '이름:' },
-    'auth.field.in':               { en: 'in:',      ko: '위치:' },
-    'auth.field.value':            { en: 'Value:',   ko: '값:' },
-    'basic.field.username':        { en: 'Username:',ko: '사용자 ID:' },
-    'basic.field.password':        { en: 'Password:',ko: '비밀번호:' }
-    // P2 (오퍼레이션/응답) 는 필요 시 추가
-  };
-
-  // 빠른 lookup 을 위해 EN → KO 인덱스 사전 생성
-  var EN_TO_KO = Object.create(null);
-  Object.keys(I18N_MAP).forEach(function (k) {
-    var e = I18N_MAP[k];
-    EN_TO_KO[e.en] = e.ko;
-  });
-
-  // ── 치환 대상 노드 식별 + 치환 ──
-  function translateNode(node) {
-    if (!node) return;
-    if (node.nodeType === Node.TEXT_NODE) {
-      var raw = node.nodeValue;
-      if (!raw) return;
-      var trimmed = raw.trim();
-      if (!trimmed) return;
-      // 1) 완전 일치 (가장 안전)
-      if (EN_TO_KO[trimmed]) {
-        node.nodeValue = raw.replace(trimmed, EN_TO_KO[trimmed]);
-        return;
-      }
-      // 2) 라벨 colon 패턴: "Token URL:" 같이 끝이 ":" 인 짧은 라벨
-      //    (불필요 — 1번 완전 일치로 대부분 커버)
-      return;
-    }
-    if (node.nodeType !== Node.ELEMENT_NODE) return;
-    if (node.tagName === 'SCRIPT' || node.tagName === 'STYLE') return;
-
-    // input placeholder / button title 도 일부 케이스에 대비
-    if (node.tagName === 'INPUT' && node.placeholder && EN_TO_KO[node.placeholder.trim()]) {
-      node.placeholder = EN_TO_KO[node.placeholder.trim()];
-    }
-
-    var i, child = node.childNodes, len = child.length;
-    for (i = 0; i < len; i++) translateNode(child[i]);
-  }
-
-  function translateAll() {
-    var root = document.getElementById('swagger-ui') || document.body;
-    translateNode(root);
-  }
-
-  // ── MutationObserver — SwaggerUI 가 동적으로 DOM 을 다시 그릴 때마다 재적용 ──
-  var observer = new MutationObserver(function (mutations) {
-    for (var i = 0; i < mutations.length; i++) {
-      var m = mutations[i];
-      if (m.addedNodes && m.addedNodes.length) {
-        for (var j = 0; j < m.addedNodes.length; j++) translateNode(m.addedNodes[j]);
-      }
-      if (m.type === 'characterData') {
-        translateNode(m.target);
-      }
-    }
-  });
-
-  function start() {
-    translateAll();
-    observer.observe(document.body, {
-      childList: true,
-      subtree: true,
-      characterData: true
-    });
-  }
-
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', start);
-  } else {
-    start();
-  }
-})(window);

build.gradle

@@ -4,6 +4,7 @@ plugins {
 	id 'eclipse-wtp'
     id 'idea'
     id 'war'
+	id 'com.diffplug.eclipse.apt' version '3.41.1'
 }
 
 group 'com.eactive'
@@ -48,6 +49,10 @@ compileJava {
 	options.encoding = 'UTF-8'
 	options.compilerArgs = ['-parameters']
 	options.generatedSourceOutputDirectory = project.file(generatedJavaDir)
+
+	aptOptions {
+		processorArgs = [ 'querydsl.generatedAnnotationClass' : 'com.querydsl.core.annotations.Generated' ]
+	}
 }
 
 war {
@@ -84,11 +89,10 @@ dependencies {
 	implementation project(':elink-online-emsclient')
 	implementation project(':elink-portal-common')
 	//implementation project(':kjb-safedb')
-    //implementation project(":eapim-admin-djb")
+    implementation project(":eapim-admin-djb")
 
-    /* Custom Libs (damo-manager.jar 는 Tomcat lib 가 런타임 제공 → compileOnly, WAR 미포함) */
-    implementation fileTree(dir: 'libs', include: ['*.jar'], exclude: ['damo-manager.jar'])
-    compileOnly files('libs/damo-manager.jar')
+    /* Custom Libs */
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
 	//implementation "org.dom4j:dom4j:2.1.3"
     //implementation "com.rabbitmq:amqp-client:3.6.6"
@@ -252,11 +256,11 @@ eclipse {
 	}
 	synchronizationTasks settingEclipseEncoding, initDirs
 	jdt {
-//		apt {
-//			// generated 된 패스 경로를 .setting/org.eclipse.jdt.apt.core.prefs 의 org.eclipse.jdt.apt.genSrcDir에 적용한다.
-//			// project > properties > Java Compiler > Annoation Processing 화면에서 확인 가능하다.
-//			genSrcDir = file(generatedJavaDir)
-//		}
+		apt {
+			// generated 된 패스 경로를 .setting/org.eclipse.jdt.apt.core.prefs 의 org.eclipse.jdt.apt.genSrcDir에 적용한다.
+			// project > properties > Java Compiler > Annoation Processing 화면에서 확인 가능하다.
+			genSrcDir = file(generatedJavaDir)
+		}
 	}
 	project {
 		if (!natures.contains('org.eclipse.buildship.core.gradleprojectnature')) {

build.gradle.intellij

@@ -1,9 +1,9 @@
 plugins {
 	id 'java-library'
-    id 'eclipse'
-	id 'eclipse-wtp'
     id 'idea'
     id 'war'
+	id 'project-report'
+    id 'checkstyle'
 }
 
 group 'com.eactive'
@@ -14,19 +14,17 @@ def quartzVersion = "2.2.1"
 def queryDslVersion = "5.0.0"
 def hibernateVersion = "5.6.15.Final"
 
-def nexusUrl = "https://nexus.eactive.synology.me:8090"
+/*def nexusUrl = "https://nexus.eactive.synology.me:8090"*/
 //def useOnJboss = false
 
 def generatedJavaDir = "$buildDir/generated/java"
 
-allprojects {
-    repositories {
-        maven {
-            url "${nexusUrl}/repository/maven-public/"
-            allowInsecureProtocol = true
-        }
-    }
-}
+/*repositories {
+    maven {
+		url "${nexusUrl}/repository/maven-public/"
+		allowInsecureProtocol = true
+	}
+}*/
 
 project.webAppDirName = 'WebContent'
 
@@ -36,6 +34,10 @@ java {
 	}
 }
 
+checkstyle {
+    toolVersion = '8.45.1'
+}
+
 sourceSets {
     main {
         java {
@@ -46,7 +48,10 @@ sourceSets {
 
 compileJava {
 	options.encoding = 'UTF-8'
-	options.compilerArgs = ['-parameters']
+	options.compilerArgs = [
+		'-parameters',
+		'-Aquerydsl.generatedAnnotationClass=com.querydsl.core.annotations.Generated'
+	]
 	options.generatedSourceOutputDirectory = project.file(generatedJavaDir)
 }
 
@@ -62,6 +67,7 @@ war {
 	// rootSpec.exclude '**/persistence.xml'
 	exclude '**/context.xml'
 	exclude '**/context-*.xml'
+	exclude '**/context_*.xml'
 	archiveFileName = "eapim-admin.war"
 	duplicatesStrategy = DuplicatesStrategy.WARN
 }
@@ -83,12 +89,11 @@ dependencies {
     implementation project(':elink-online-common')
 	implementation project(':elink-online-emsclient')
 	implementation project(':elink-portal-common')
-	//implementation project(':kjb-safedb')
-    implementation project(":eapim-admin-djb")
+	implementation project(':kjb-safedb')
+    implementation project(":eapim-admin-kjb")
 
-    /* Custom Libs (damo-manager.jar 는 Tomcat lib 가 런타임 제공 → compileOnly, WAR 미포함) */
-    implementation fileTree(dir: 'libs', include: ['*.jar'], exclude: ['damo-manager.jar'])
-    compileOnly files('libs/damo-manager.jar')
+    /* Custom Libs */
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
 	//implementation "org.dom4j:dom4j:2.1.3"
     //implementation "com.rabbitmq:amqp-client:3.6.6"
@@ -121,7 +126,7 @@ dependencies {
     implementation "org.snmp4j:snmp4j:1.10.1"
     implementation "com.googlecode.json-simple:json-simple:1.1.1"
 
-    implementation "io.netty:netty-all:4.1.94.Final"
+    implementation "io.netty:netty-all:4.1.0.Final"
 
     compileOnly "org.apache.mina:mina-filter-ssl:1.1.6"
     compileOnly "org.apache.mina:mina-core:1.1.6"
@@ -198,11 +203,12 @@ dependencies {
    implementation 'software.amazon.awssdk:sso:2.20.142'
    implementation 'software.amazon.awssdk:sts:2.20.142'
 
-   implementation group: 'commons-net', name: 'commons-net', version: '3.5'
+   implementation ('io.kubernetes:client-java:18.0.1') {
+      exclude group: 'org.slf4j', module: 'slf4j-api'
+      exclude group: 'org.slf4j', module: 'logback-classic'
+   }
 
-   // JDK 8 의 rt.jar 에는 org.w3c.dom.ElementTraversal 이 없어 xercesImpl 가 NCDFE 를 일으킴.
-   // xml-apis 1.4.01 에 그 클래스가 포함됨. 직접 의존성으로 묶어 WAR 에 패키징되도록 함.
-   implementation 'xml-apis:xml-apis:1.4.01'
+   implementation group: 'commons-net', name: 'commons-net', version: '3.5'
 
 	testRuntimeOnly 'com.h2database:h2:2.1.214'
 	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
@@ -223,51 +229,18 @@ configurations.all {
         cacheDynamicVersionsFor 10, 'minutes'
         // Do not cache changing modules
         cacheChangingModulesFor 0, 'seconds'
-
-        // JDK 8 의 rt.jar 에는 org.w3c.dom.ElementTraversal 이 없음.
-        // 일부 transitive 가 끌어오는 xml-apis:1.0.b2 (2002, DOM L2) 는 이 클래스를 포함하지 않아
-        // xercesImpl 가 NoClassDefFoundError 를 일으킴 → 1.4.01 로 강제 통일.
-        force 'xml-apis:xml-apis:1.4.01'
     }
 }
 
 
-task settingEclipseEncoding {
-    if (project.file('.settings').exists()) {
-        File f = file('.settings/org.eclipse.core.resources.prefs')
-        f.write('eclipse.preferences.version=1\n')
-        f.append('encoding/<project>=utf-8')
-    }
-}
-
 task initDirs() {
 	file(generatedJavaDir).mkdirs()
 }
 
-eclipse {
-	wtp {
-		component {
-			contextPath = 'monitoring'
-		}
-	}
-	synchronizationTasks settingEclipseEncoding, initDirs
-	jdt {
-		apt {
-			// generated 된 패스 경로를 .setting/org.eclipse.jdt.apt.core.prefs 의 org.eclipse.jdt.apt.genSrcDir에 적용한다.
-			// project > properties > Java Compiler > Annoation Processing 화면에서 확인 가능하다.
-			genSrcDir = file(generatedJavaDir)
-		}
-	}
-	project {
-		if (!natures.contains('org.eclipse.buildship.core.gradleprojectnature')) {
-			natures.add('org.eclipse.buildship.core.gradleprojectnature')
-			buildCommand 'org.eclipse.buildship.core.gradleprojectbuilder'
-		}
-	}
-}
 
-tasks.withType(JavaCompile) {
-    options.fork = true  // 컴파일을 별도 프로세스로 분리
-    options.forkOptions.memoryMaximumSize = '4g' // 컴파일러에 2GB 할당 (필요시 4g로 증량)
-    options.encoding = 'UTF-8'
-}
+tasks.withType(Checkstyle) {
+    reports {
+        xml.required = false
+        html.required = true
+    }
+}

deploy/systemd/eapim-admin.service

@@ -1,51 +0,0 @@
-# DJBank EAPIM Admin — user-scope systemd unit
-#
-# Install (one-time, on the host as `djb`):
-#   sudo loginctl enable-linger djb              # allow services to outlive ssh logout
-#   mkdir -p ~/.config/systemd/user
-#   # workflow copies this file in on each deploy; for first boot you can also do:
-#   #   cp /prod/.../deploy/systemd/eapim-admin.service ~/.config/systemd/user/
-#   systemctl --user daemon-reload
-#   systemctl --user enable eapim-admin
-#   systemctl --user start  eapim-admin
-#
-# Why this exists:
-#   - `catalina.sh start` + `nohup &` does NOT escape the Gitea Actions runner
-#     process group. When the workflow step finishes, the runner sends SIGTERM
-#     to the process tree and Tomcat dies seconds after boot.
-#   - Running Tomcat as a systemd user service detaches lifecycle from the
-#     runner entirely. The workflow just calls `systemctl --user restart` and
-#     systemd owns the process.
-
-[Unit]
-Description=DJBank EAPIM Admin (Tomcat 9)
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-
-Environment=JAVA_HOME=/apps/opts/jdk17
-Environment=CATALINA_BASE=/prod/eapim/adminportal
-Environment=CATALINA_HOME=/prod/eapim/apache-tomcat-9.0.116
-Environment=CATALINA_PID=/prod/eapim/adminportal/temp/catalina.pid
-
-# `catalina.sh run` keeps Tomcat in the foreground so systemd can supervise it.
-ExecStart=/prod/eapim/apache-tomcat-9.0.116/bin/catalina.sh run
-
-# Graceful shutdown via Tomcat's shutdown port, 30s window.
-ExecStop=/prod/eapim/apache-tomcat-9.0.116/bin/catalina.sh stop 30
-
-# Tomcat returns 143 on SIGTERM during normal stop — treat as success.
-SuccessExitStatus=143
-TimeoutStartSec=180
-TimeoutStopSec=60
-
-Restart=on-failure
-RestartSec=10
-
-# Memory / fd limits — adjust as needed.
-LimitNOFILE=65535
-
-[Install]
-WantedBy=default.target

settings.gradle

@@ -7,7 +7,7 @@ include 'elink-online-common'
 include 'elink-online-emsclient'
 include 'elink-portal-common'
 //include 'kjb-safedb'
-//include 'eapim-admin-djb'
+include 'eapim-admin-djb'
 
 project (':elink-online-core-jpa').projectDir = new File(settingsDir, "../eapim-online/elink-online-core-jpa")
 project (':elink-online-core').projectDir = new File(settingsDir, "../eapim-online/elink-online-core")
@@ -16,4 +16,4 @@ project (':elink-online-common').projectDir = new File(settingsDir, "../eapim-on
 project (':elink-online-emsclient').projectDir = new File(settingsDir, "../eapim-online/elink-online-emsclient")
 project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common")
 //project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb")
-//project (':eapim-admin-djb').projectDir = new File(settingsDir, "../eapim-admin-djb")
+project (':eapim-admin-djb').projectDir = new File(settingsDir, "../eapim-admin-djb")

src/main/java/com/eactive/eai/rms/common/acl/audit/adapter/in/web/AuditLogInterceptor.java

@@ -41,12 +41,10 @@ public class AuditLogInterceptor implements HandlerInterceptor {
 
 					if (isAuditableUsecase.isAuditable(userId, command, logType, systemCode)) {
 						String parameters = getParametersAsString(request);
-						String message = request.getParameter("auditReason");
 						log
 								.debug("audit log save : logType={}, cmd={}, user={}, parameters={}", logType, command,
 										userId, parameters);
-						saveAuditLogUseCase
-								.log(systemCode, logType, command, remoteAddress, userId, parameters, message);
+						saveAuditLogUseCase.log(systemCode, logType, command, remoteAddress, userId, parameters);
 					}
 
 				}

src/main/java/com/eactive/eai/rms/common/acl/audit/domain/AuditLog.java

@@ -23,8 +23,6 @@ public class AuditLog {
 
 	private String logTypeText;
 
-	private String message;
-
 	private String parameters;
 
 	private LocalDateTime lastModifiedDate;

src/main/java/com/eactive/eai/rms/common/acl/audit/port/in/SaveAuditLogUseCase.java

@@ -3,6 +3,6 @@ package com.eactive.eai.rms.common.acl.audit.port.in;
 public interface SaveAuditLogUseCase {
 
 	public void log(String systemCode, String logType, String command, String remoteAddress, String userId,
-			String parameters, String message);
+			String parameters);
 
 }

src/main/java/com/eactive/eai/rms/common/acl/audit/service/AuditLogService.java

@@ -59,16 +59,15 @@ class AuditLogService
 
 	@Override
 	public void log(String systemCode, String logType, String command, String remoteAddress, String userId,
-			String parameters, String message) {
+			String parameters) {
 
 		AuditLog auditLog = new AuditLog(systemCode, logType, command, userId, remoteAddress);
 		String auditPointKey = AuditPoint.generateKey(logType, systemCode, command);
 		AuditPoint auditPoint = auditPoints.get(auditPointKey);
-
+		
 		auditLog.setLogTypeText(auditPoint.getLogTypeText());
 		auditLog.setLastModifiedDate(LocalDateTime.now());
 		auditLog.setParameters(parameters);
-		auditLog.setMessage(message);
 
 		saveAuditLogPort.save(auditLog);
 	}

src/main/java/com/eactive/eai/rms/common/acl/sitemap/SitemapController.java

@@ -1,23 +0,0 @@
-package com.eactive.eai.rms.common.acl.sitemap;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.eactive.eai.rms.common.base.BaseAnnotationController;
-
-@Controller
-@RequiredArgsConstructor
-public class SitemapController extends BaseAnnotationController {
-
-	private final SitemapService sitemapService;
-
-	@GetMapping(value = "/common/acl/sitemap/sitemapMan.view")
-	public String view(@RequestParam(value = "serviceType", required = false) String serviceType, Model model) {
-		model.addAttribute("sitemapTree", sitemapService.getSitemapTree(serviceType));
-		return "/common/acl/sitemap/sitemapMan";
-	}
-
-}

src/main/java/com/eactive/eai/rms/common/acl/sitemap/SitemapService.java

@@ -1,11 +0,0 @@
-package com.eactive.eai.rms.common.acl.sitemap;
-
-import java.util.List;
-
-import com.eactive.eai.rms.common.acl.sitemap.ui.SitemapNode;
-
-public interface SitemapService {
-
-	public List<SitemapNode> getSitemapTree(String serviceType);
-
-}

src/main/java/com/eactive/eai/rms/common/acl/sitemap/SitemapServiceImpl.java

@@ -1,96 +0,0 @@
-package com.eactive.eai.rms.common.acl.sitemap;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.eactive.eai.rms.common.acl.sitemap.ui.SitemapNode;
-import com.eactive.eai.rms.common.base.BaseService;
-import com.eactive.eai.rms.data.entity.man.menu.Menu;
-import com.eactive.eai.rms.data.entity.man.menu.MenuService;
-import com.eactive.eai.rms.data.entity.man.role.RoleMenuAuthService;
-
-@Service("sitemapService")
-@Transactional(transactionManager = "transactionManagerForEMS")
-public class SitemapServiceImpl extends BaseService implements SitemapService {
-
-	@Autowired
-	private MenuService menuService;
-
-	@Autowired
-	private RoleMenuAuthService roleMenuAuthService;
-
-	public List<SitemapNode> getSitemapTree(String serviceType) {
-		Menu root = menuService.getById("ROOT_DEV");
-		Menu langRoot = findLangRoot(root);
-		List<SitemapNode> tree = new ArrayList<>();
-		if (langRoot == null) {
-			return tree;
-		}
-
-		Set<String> serviceTypeMenuIds = StringUtils.isBlank(serviceType)
-				? null
-				: new HashSet<>(roleMenuAuthService.findMenuIdsByServiceType(serviceType));
-
-		for (Menu menu : sortedChildren(langRoot)) {
-			if (isVisible(menu) && matchesServiceType(menu, serviceTypeMenuIds)) {
-				tree.add(buildNode(menu, serviceTypeMenuIds));
-			}
-		}
-		return tree;
-	}
-
-	// 엔티티의 childMenus는 menuId 기준으로 정렬되어 있어, 실제 메뉴(운영화면 GNB)와 동일하게 sortOrder 기준으로 재정렬한다.
-	private List<Menu> sortedChildren(Menu menu) {
-		List<Menu> children = new ArrayList<>(menu.getChildMenus());
-		children.sort(Comparator.comparing(Menu::getSortOrder, Comparator.nullsLast(Comparator.naturalOrder())));
-		return children;
-	}
-
-	// MenuService.getMenuList()의 GNB 렌더링과 동일하게 "ROOT"(한글)/"ROOT_EN"(영문) 이름의 언어별 루트를 찾는다.
-	private Menu findLangRoot(Menu root) {
-		String lang = LocaleContextHolder.getLocale().getLanguage();
-		String langRootName = (StringUtils.isBlank(lang) || "ko".equalsIgnoreCase(lang))
-				? "ROOT"
-				: "ROOT_" + lang.toUpperCase();
-
-		return root.getChildMenus().stream()
-				.filter(m -> langRootName.equalsIgnoreCase(m.getMenuName()))
-				.findFirst()
-				.orElse(null);
-	}
-
-	private SitemapNode buildNode(Menu menu, Set<String> serviceTypeMenuIds) {
-		SitemapNode node = new SitemapNode(menu);
-		for (Menu child : sortedChildren(menu)) {
-			if (isVisible(child) && matchesServiceType(child, serviceTypeMenuIds)) {
-				node.getChildren().add(buildNode(child, serviceTypeMenuIds));
-			}
-		}
-		return node;
-	}
-
-	private boolean isVisible(Menu menu) {
-		return "Y".equalsIgnoreCase(menu.getDisplayYn()) && "Y".equalsIgnoreCase(menu.getUseYn());
-	}
-
-	// serviceType 필터가 없으면 통과. 있으면 자신이나 하위메뉴 중 하나라도 해당 serviceType 권한이 있어야 통과(상위메뉴 누락 방지).
-	private boolean matchesServiceType(Menu menu, Set<String> serviceTypeMenuIds) {
-		if (serviceTypeMenuIds == null) {
-			return true;
-		}
-		if (serviceTypeMenuIds.contains(menu.getMenuId())) {
-			return true;
-		}
-		return menu.getChildMenus().stream().anyMatch(child -> matchesServiceType(child, serviceTypeMenuIds));
-	}
-
-}

src/main/java/com/eactive/eai/rms/common/acl/sitemap/ui/SitemapNode.java

@@ -1,29 +0,0 @@
-package com.eactive.eai.rms.common.acl.sitemap.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.eactive.eai.rms.data.entity.man.menu.Menu;
-
-import lombok.Data;
-
-@Data
-public class SitemapNode {
-
-	private String menuId;
-
-	private String menuName;
-
-	private String menuUrl;
-
-	private List<SitemapNode> children = new ArrayList<>();
-
-	public SitemapNode(Menu menu) {
-		this.menuId = menu.getMenuId();
-		this.menuName = menu.getMenuName();
-		this.menuUrl = menu.getMenuUrl();
-	}
-
-	public SitemapNode() {
-	}
-}

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

@@ -33,7 +33,6 @@ import com.eactive.eai.rms.data.entity.man.role.Role;
 import com.eactive.eai.rms.data.entity.man.role.RoleService;
 import com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusinessService;
 import com.eactive.eai.rms.onl.common.exception.BizException;
-import com.eactive.ext.djb.DamoManager;
 
 import lombok.RequiredArgsConstructor;
 
@@ -41,8 +40,6 @@ import lombok.RequiredArgsConstructor;
 @Transactional(transactionManager = "transactionManagerForEMS")
 @RequiredArgsConstructor
 public class UserManService extends BaseService {
-	
-	
 
 	private final UserInfoService userInfoService;
 	private final UserRoleService userRoleService;
@@ -100,11 +97,9 @@ 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()+subfix));
+			userInfo.setPassword(Seed.encrypt(userUI.getUserId()));
 		} catch (Exception e) {
 			throw new RuntimeException("Error encrypting password", e);
 		}
@@ -144,9 +139,8 @@ 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()+subfix));
+		userInfo.setPassword(Seed.encrypt(userUI.getUserId()));
 		userUIMapper.updateToEntity(userUI, userInfo);
 		userInfoService.save(userInfo);
 	}

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

@@ -21,7 +21,6 @@ import com.eactive.eai.rms.data.entity.man.user.UserServiceType;
 import com.eactive.eai.rms.data.entity.man.user.UserServiceTypeId;
 import com.eactive.eai.rms.data.entity.man.user.UserServiceTypeService;
 import com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusinessService;
-import com.eactive.ext.djb.DamoManager;
 
 @Service
 @Transactional
@@ -125,7 +124,7 @@ public class UserSyncService extends BaseService {
 			UserInfo userInfo = new UserInfo();
 			userInfo.setUserid(userId);
 			userInfo.setUsername(userInfoMap.get("EMPY_NM").toString());
-			userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,userId));
+			userInfo.setPassword(Seed.encrypt(userId));
 			userInfo.setRoleidnfiname(CommonConstants.DEPT_DEVELOPER);
 
 			userInfoService.save(userInfo);

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

@@ -258,15 +258,9 @@ public interface MonitoringContext {
    // 자동 로그아웃 타임아웃 (단위: 분, 기본값: 10)
    public static final String RMS_AUTO_LOGOUT_TIMEOUT = "rms.auto.logout.timeout";
 
-   // 웹훅 
-   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";
-   
-   
+   // 웹훅 재전송 설정
+   public static final String API_WEBHOOK_RETRY_COUNT = "api.webhook.retry_count";
+   public static final String API_WEBHOOK_RETRY_TIME  = "api.webhook.retry_time";
    
    
 

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

@@ -21,8 +21,8 @@ import com.eactive.eai.rms.common.util.ContainerUtil;
 import com.eactive.eai.rms.data.entity.man.monitoringProperty.MonitoringPropertyId;
 import com.eactive.eai.rms.data.entity.man.monitoringProperty.service.MonitoringPropertyGroupService;
 import com.eactive.eai.rms.data.entity.man.monitoringProperty.service.MonitoringPropertyService;
-import com.eactive.eai.rms.ext.djb.common.DjbPropertyHolder;
-import com.eactive.eai.rms.ext.djb.common.DjbPropertyInjector;
+import com.eactive.ext.kjb.common.KjbPropertyHolder;
+import com.eactive.ext.kjb.util.KjbPropertyInjector;
 
 @Service("monitoringContext")
 @Transactional(transactionManager = "transactionManagerForEMS")
@@ -45,7 +45,7 @@ class MonitoringContextImpl implements MonitoringContext {
 	
 	public void refresh() {
 		init();
-		DjbPropertyHolder.reload();
+		KjbPropertyHolder.reload();
 	}
 
 	public void refresh(String propName) {
@@ -85,9 +85,9 @@ class MonitoringContextImpl implements MonitoringContext {
 
 			setPortMapper(monitoringContextDAO.getPortMap());
 
-			// DjbPropertyHolder 초기화
-			DjbPropertyInjector injector = new DjbPropertyInjector(monitoringPropertyService, "Monitoring");
-			DjbPropertyHolder.initialize(injector::inject);
+			// KjbPropertyHolder 초기화
+			KjbPropertyInjector injector = new KjbPropertyInjector(monitoringPropertyService, "Monitoring");
+			KjbPropertyHolder.initialize(injector::inject);
 
 			logger.info("SSO AgentId : " + System.getProperty(EAI_AGENTID));
 

src/main/java/com/eactive/eai/rms/common/filter/RequestWrapper.java

@@ -53,11 +53,9 @@ class RequestWrapper extends HttpServletRequestWrapper {
 			"^data:image/.*",
 			Pattern.CASE_INSENSITIVE);
 
-	// XSS 문자 변환을 건너뛸 파라미터 목록 (리치 텍스트 에디터 콘텐츠, 메시지 템플릿 본문 등)
-	// XSS 패턴 필터링은 적용하지만 <, >, & 등으로 변환하지 않음
-	// (메시지 템플릿은 SMS/메신저 평문으로 전송되므로 '&'가 '&'로 깨지면 안 됨)
-	private static final String[] SKIP_CHAR_CONVERT_PARAMS = {"contents", "content", "description",
-			"subjectTemplate", "smsTemplate", "emailTemplate", "messengerTemplate"};
+	// XSS 문자 변환을 건너뛸 파라미터 목록 (리치 텍스트 에디터 콘텐츠 등)
+	// XSS 패턴 필터링은 적용하지만 <, > 등으로 변환하지 않음
+	private static final String[] SKIP_CHAR_CONVERT_PARAMS = {"contents", "content", "description"};
 
 	// 현재 처리 중인 파라미터명 (cleanXSS에서 문자 변환 여부 결정에 사용)
 	private ThreadLocal<String> currentParameter = new ThreadLocal<>();

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

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

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

@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.View;
 
 import com.eactive.eai.common.seed.Seed;
-import com.eactive.ext.djb.DamoManager;
+import com.eactive.eai.rms.ext.kjb.smsauth.SmsAuthService;
 import com.eactive.eai.data.converter.LocalDateTimeFormatters;
 import com.eactive.eai.rms.common.context.MonitoringContext;
 import com.eactive.eai.rms.common.datasource.DataSourceType;
@@ -50,7 +50,6 @@ import com.eactive.eai.rms.data.entity.man.user.UserLoginHistoryService;
 import com.eactive.eai.rms.data.entity.man.user.UserRole;
 import com.eactive.eai.rms.data.entity.man.user.UserRoleService;
 import com.eactive.eai.rms.data.entity.man.user.UserServiceTypeService;
-import com.eactive.eai.rms.ext.djb.smsauth.SmsAuthService;
 
 @Controller
 public class MainController implements InterceptorSkipController {
@@ -73,8 +72,7 @@ public class MainController implements InterceptorSkipController {
 	private final LoginService loginService;
 	private final MonitoringPropertyService monitoringPropertyService;
 	private final UserLoginHistoryService userLoginHistoryService;
-	private final SmsAuthService smsAuthService;
-
+	
 	@Autowired
 	public MainController(LocaleMessage localeMessage,
 						  MonitoringContext monitoringContext,
@@ -83,8 +81,7 @@ public class MainController implements InterceptorSkipController {
 						  UserRoleService userRoleService,
 						  UserServiceTypeService userServiceTypeService,
 						  MonitoringPropertyService monitoringPropertyService,
-						  UserLoginHistoryService userLoginHistoryService,
-						  SmsAuthService smsAuthService) {
+						  UserLoginHistoryService userLoginHistoryService) {
 		this.localeMessage = localeMessage;
 		this.monitoringContext = monitoringContext;
 		this.userInfoService = userInfoService;
@@ -93,7 +90,6 @@ public class MainController implements InterceptorSkipController {
 		this.userServiceTypeService = userServiceTypeService;
 		this.monitoringPropertyService = monitoringPropertyService;
 		this.userLoginHistoryService = userLoginHistoryService;
-		this.smsAuthService = smsAuthService;
 	}
 
 	@RequestMapping(value = "/loginForm.do")
@@ -191,19 +187,6 @@ 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();
@@ -219,7 +202,7 @@ public class MainController implements InterceptorSkipController {
 
 				// SMS 인증번호 생성 및 발송
 				String authCode = smsAuthService.generateAuthCode();
-				boolean sent = smsAuthService.sendAuthCode(userInfo, authCode);
+				boolean sent = smsAuthService.sendAuthCode(userInfo.getCphnno(), authCode);
 
 				if (!sent) {
 					return LoginResponseDto.builder()
@@ -280,8 +263,16 @@ public class MainController implements InterceptorSkipController {
 		}
 	}
 
+	/**
+	 * SmsAuthService 인스턴스 조회 (singleton)
+	 */
 	private SmsAuthService getSmsAuthService() {
-		return smsAuthService;
+		try {
+			return SmsAuthService.getInstance();
+		} catch (Exception e) {
+			logger.warn("SmsAuthService 초기화 실패 - SMS 인증 비활성화 처리", e);
+			return null;
+		}
 	}
 
 	/**
@@ -372,7 +363,7 @@ public class MainController implements InterceptorSkipController {
 		String loginMode = System.getProperty("login.mode");
 		if("db".equals(loginMode) || "DB".equals(loginMode)) {
 			/* 기존로직 - LDAP 사용 x */
-			if (!userInfo.getPassword().equals(DamoManager.getInstance().hash(DamoManager.SHA256, dto.getPassword()))) {
+			if (!userInfo.getPassword().equals(Seed.encrypt(dto.getPassword()))) {
 				// password 다름.
 				setLoginFailure(request, session, "login.loginfail1",
 						"login.loginfail2");
@@ -771,9 +762,6 @@ 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 {
 
@@ -811,9 +799,9 @@ public class MainController implements InterceptorSkipController {
 						.getString("login.pwdmismatch4"));
 				return REDIRECT_CHANGE_PASSWORD_URL;
 			}
-			
+
 			// 3. 비밀번호 체크
-			if (!userInfo.getPassword().equals(DamoManager.getInstance().hash(DamoManager.SHA256,resetPassword))
+			if (!userInfo.getPassword().equals(Seed.encrypt(resetPassword))
 					|| !userInfo.getUserid().equals(resetUserId)) {
 				UserAccessLogger.log(request, LOG_CATEGORY_LOGIN, "F",
 						localeMessage
@@ -824,15 +812,13 @@ public class MainController implements InterceptorSkipController {
 			}
 
 			// 4. 비밀번호 변경
-			userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,changePassword));
+			userInfo.setPassword(Seed.encrypt(changePassword));
 			userInfoService.save(userInfo);
 
 			UserAccessLogger.log(request, LOG_CATEGORY_LOGIN, "S", localeMessage
 					.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/common/property/MonitoringPropertyManService.java

@@ -35,7 +35,6 @@ public class MonitoringPropertyManService extends BaseService {
 
 	public MonitoringPropertyGroupUI selectDetail(String prptyGroupName) {
 		MonitoringPropertyGroup propertyGroup = propertyGroupService.getById(prptyGroupName);
-		propertyGroup.getMonitoringProperties().sort(Comparator.comparing(p -> p.getId().getPrptyName()));
 		return propertyGroupMapper.toVo(propertyGroup);
 	}
 

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.StdJDBCDelegate");
+      quartzProperties.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");
       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/EMSScheduler.java

@@ -15,6 +15,4 @@ public interface EMSScheduler {
 
    void deleteAndAddJob(Scheduler scheduler, String jobName) throws SchedulerException, ClassNotFoundException;
 
-   void reloadJob(String jobName) throws SchedulerException, ClassNotFoundException;
-
 }

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

@@ -120,60 +120,12 @@ public class EMSSchedulerImpl implements EMSScheduler {
 		}
 	}
 
-   @Override
-   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);
-         deleteJob(clusteredScheduler, jobName);
-      }
-   }
-
-   private void reloadClusteredJob(JobInfo jobInfo) throws SchedulerException, ClassNotFoundException {
-      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);
-      JobDetail existingJob = clusteredScheduler.getJobDetail(jobKey);
-
-      if (existing != null && existingJob != null) {
-         // JobDetail(JobData 포함) 갱신
-         @SuppressWarnings("unchecked")
-         Class<Job> jobClass = (Class<Job>) Class.forName(jobInfo.getJobClassName());
-         JobBuilder jobBuilder = newJob(jobClass).withIdentity(jobKey);
-         for (JobData jobData : jobInfo.getJobDatas()) {
-            jobBuilder.usingJobData(jobData.getId().getDataKey(), jobData.getDataValue());
-         }
-         clusteredScheduler.addJob(jobBuilder.build(), true);
-
-         // 트리거(cron) 갱신
-         CronTrigger newTrigger = newTrigger()
-               .withIdentity(triggerKey)
-               .withSchedule(cronSchedule(jobInfo.getCronExp()))
-               .build();
-         Date ft = clusteredScheduler.rescheduleJob(triggerKey, newTrigger);
-         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");
 		}
 	}
 
@@ -199,7 +151,10 @@ public class EMSSchedulerImpl implements EMSScheduler {
 					.withSchedule(cronSchedule(info.getCronExp()))
 					.build();
 
-         inScheduler.scheduleJob(job, trigger);
+         Date ft = inScheduler.scheduleJob(job, trigger);
+			log
+					.info("{} has been scheduled to run at: {} and repeat based on expression: {}", job.getKey(), ft,
+							trigger.getCronExpression());
 		}
 	}
 

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

@@ -45,9 +45,6 @@ public class SchedulerManController extends BaseAnnotationController {
 	@Qualifier("monitoringSyncAgent")
 	private MonitoringSyncAgent monitoringSyncAgent;
 
-	@Autowired
-	private EMSScheduler emsScheduler;
-
 	@GetMapping(value = "/common/scheduler/schedulerMan.view")
 	public String viewList() {
 		return "/common/scheduler/schedulerMan";
@@ -99,11 +96,6 @@ public class SchedulerManController extends BaseAnnotationController {
 	@PostMapping(value = "/common/scheduler/schedulerMan.json", params = "cmd=UPDATE")
 	public ResponseEntity<Void> update(JobInfoUI jobInfoUI) {
 		service.update(jobInfoUI);
-		try {
-			emsScheduler.reloadJob(jobInfoUI.getId());
-		} catch (Exception e) {
-			logger.error("reloadJob error on current server", e);
-		}
 		syncReloadScheduler(jobInfoUI.getId());
 		return ResponseEntity.ok().build();
 	}
@@ -123,7 +115,7 @@ public class SchedulerManController extends BaseAnnotationController {
 		String url = "/monitoring/schedulerReload.do";
 
 		try {
-			ret = monitoringSyncAgent.targetSync(url, paramMap);
+			ret = monitoringSyncAgent.sync(url, paramMap);
 		} catch (Exception e) {
 			logger.error("syncReloadScheduler error", e);
 		} finally {

src/main/java/com/eactive/eai/rms/data/entity/man/role/RoleMenuAuthService.java

@@ -51,17 +51,4 @@ public class RoleMenuAuthService extends AbstractEMSDataSerivce<RoleMenuAuth, Ro
             .fetch();
    }
 
-   public List<String> findMenuIdsByServiceType(String serviceType) {
-
-      QRoleMenuAuth qRoleMenuAuth = QRoleMenuAuth.roleMenuAuth;
-
-      return getJPAQueryFactory()
-            .select(qRoleMenuAuth.id.menuId)
-            .distinct()
-            .from(qRoleMenuAuth)
-            .where(qRoleMenuAuth.id.serviceType.eq(serviceType))
-            .setHint(QueryHints.CACHEABLE, true)
-            .fetch();
-   }
-
 }

src/main/java/com/eactive/eai/rms/data/entity/onl/apim/apigroup/ApiGroupService.java

@@ -2,7 +2,6 @@ package com.eactive.eai.rms.data.entity.onl.apim.apigroup;
 
 import com.eactive.eai.data.entity.onl.apim.apigroup.ApiGroup;
 import com.eactive.eai.data.entity.onl.apim.apigroup.ApiGroupApi;
-import com.eactive.eai.data.entity.onl.apim.apigroup.ApiGroupApiId;
 import com.eactive.eai.data.entity.onl.apim.apigroup.QApiGroup;
 import com.eactive.eai.data.entity.onl.apim.apigroup.QApiGroupApi;
 import com.eactive.eai.data.jpa.AbstractDataService;
@@ -76,37 +75,4 @@ public class ApiGroupService extends AbstractDataService<ApiGroup, String, ApiGr
 				.where(qApiGroup.id.in(apiGroupIds))
 				.fetch();
 	}
-
-	/** API 를 지정한 그룹 목록에만 소속시킨다(기존 소속 제거 후 재설정). */
-	public void setApiGroupsForApi(String apiId, List<String> groupIds) {
-		deleteApiGroupApiByApiId(apiId);
-		if (groupIds == null) {
-			return;
-		}
-		for (String gid : groupIds) {
-			if (StringUtils.isBlank(gid)) {
-				continue;
-			}
-			ApiGroup group = repository.findById(gid).orElse(null);
-			if (group == null) {
-				continue;
-			}
-			Hibernate.initialize(group.getApiGroupApiList());
-			List<ApiGroupApi> list = group.getApiGroupApiList();
-			boolean exists = false;
-			for (ApiGroupApi a : list) {
-				if (a.getId() != null && apiId.equals(a.getId().getApiId())) {
-					exists = true;
-					break;
-				}
-			}
-			if (!exists) {
-				ApiGroupApi a = new ApiGroupApi();
-				a.setId(new ApiGroupApiId(gid, apiId));
-				a.setDisplayOrder(list.size() + 1);
-				list.add(a);
-				repository.save(group);
-			}
-		}
-	}
 }

src/main/java/com/eactive/eai/rms/data/entity/onl/apim/messagerequest/MessageRequestEmsRepository.java

@@ -1,17 +0,0 @@
-package com.eactive.eai.rms.data.entity.onl.apim.messagerequest;
-
-import com.eactive.apim.portal.template.entity.MessageRequest;
-import com.eactive.eai.data.jpa.BaseRepository;
-import com.eactive.eai.rms.data.EMSDataSource;
-
-/**
- * 발송 내역(PTL_MESSAGE_REQUEST) 조회용 admin 전용 리포지토리.
- *
- * <p>elink-portal-common 의 {@code template.repository.MessageRequestRepository}(JpaRepository) 와
- * <b>단순 클래스명이 겹치면 Spring Data 빈 이름이 충돌</b>하므로(둘 다 admin 컨텍스트에 스캔됨)
- * 이름을 분리한다. 또한 QueryDSL {@code findAll(predicate, pageable)} 를 쓰기 위해
- * {@link BaseRepository} 를 상속한다.</p>
- */
-@EMSDataSource
-public interface MessageRequestEmsRepository extends BaseRepository<MessageRequest, String> {
-}

src/main/java/com/eactive/eai/rms/data/entity/onl/apim/messagerequest/MessageRequestService.java

@@ -1,77 +0,0 @@
-package com.eactive.eai.rms.data.entity.onl.apim.messagerequest;
-
-import com.eactive.apim.portal.template.entity.MessageCode;
-import com.eactive.apim.portal.template.entity.MessageRequest;
-import com.eactive.apim.portal.template.entity.QMessageRequest;
-import com.eactive.eai.rms.common.util.StringUtils;
-import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce;
-import com.eactive.eai.rms.onl.common.exception.BizException;
-import com.querydsl.core.BooleanBuilder;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDate;
-
-@Service
-@Transactional(transactionManager = "transactionManagerForEMS")
-public class MessageRequestService
-		extends AbstractEMSDataSerivce<MessageRequest, String, MessageRequestEmsRepository> {
-
-	public Page<MessageRequest> findAll(Pageable pageable, MessageRequestUISearch search) {
-		QMessageRequest q = QMessageRequest.messageRequest;
-		BooleanBuilder predicate = new BooleanBuilder();
-
-		if (StringUtils.isNotBlank(search.getSearchRequestStatus())) {
-			predicate.and(q.requestStatus.eq(search.getSearchRequestStatus()));
-		}
-		if (StringUtils.isNotBlank(search.getSearchMessageCode())) {
-			MessageCode.findServiceId(search.getSearchMessageCode())
-					.ifPresent(code -> predicate.and(q.messageCode.eq(code)));
-		}
-		if (StringUtils.isNotBlank(search.getSearchMessageType())) {
-			predicate.and(q.messageType.eq(search.getSearchMessageType()));
-		}
-		if (StringUtils.isNotBlank(search.getSearchRecipient())) {
-			predicate.and(q.username.containsIgnoreCase(search.getSearchRecipient()));
-		}
-		// requestDate 는 yyyyMMddHHmmss 14자리 문자열로 저장(LocalDateTimeToStringConverter14)되므로
-		// 고정폭 비교로 기간 필터가 동작한다.
-		if (search.getSearchFromDate() != null) {
-			predicate.and(q.requestDate.goe(search.getSearchFromDate().atStartOfDay()));
-		}
-		if (search.getSearchToDate() != null) {
-			predicate.and(q.requestDate.loe(search.getSearchToDate().atTime(23, 59, 59)));
-		}
-
-		// 발송요청 역순 고정 (Pageable 에 정렬이 없을 때의 안전장치)
-		Sort base = Sort.by(Sort.Direction.DESC, "requestDate");
-		Sort sort = pageable.getSort().isSorted() ? pageable.getSort() : base;
-		Pageable fixed = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort);
-
-		return repository.findAll(predicate, fixed);
-	}
-
-	/** 특정 일자에 SMS/KAKAO 로 발송 요청된 건수 (UMS 일련번호 채번용). */
-	public long countSmsKakaoRequestsOnDate(LocalDate date) {
-		QMessageRequest q = QMessageRequest.messageRequest;
-		BooleanBuilder predicate = new BooleanBuilder();
-		predicate.and(q.messageType.in("SMS", "KAKAO"));
-		predicate.and(q.requestDate.goe(date.atStartOfDay()));
-		predicate.and(q.requestDate.loe(date.atTime(23, 59, 59)));
-		return repository.count(predicate);
-	}
-
-	/** PENDING 상태인 건만 FAILED 로 전환한다. */
-	public void updateStatusToFailedIfPending(String id) {
-		MessageRequest entity = getById(id);
-		if (!"PENDING".equals(entity.getRequestStatus())) {
-			throw new BizException("PENDING 상태인 건만 변경할 수 있습니다.");
-		}
-		entity.setRequestStatus("FAILED");
-		save(entity);
-	}
-}

src/main/java/com/eactive/eai/rms/data/entity/onl/apim/messagerequest/MessageRequestUISearch.java

@@ -1,29 +0,0 @@
-package com.eactive.eai.rms.data.entity.onl.apim.messagerequest;
-
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDate;
-
-@Data
-public class MessageRequestUISearch {
-
-	/* 발송 상태 (PENDING/SENT/FAILED) */
-	private String searchRequestStatus;
-
-	/* 메세지 코드 (MessageCode enum name) */
-	private String searchMessageCode;
-
-	/* 메세지 유형 (EMAIL/SMS 등) */
-	private String searchMessageType;
-
-	/* 수신자 이름 (MessageRequest.username 평문 컬럼 대상, LIKE 검색) */
-	private String searchRecipient;
-
-	/* 요청일시 기간 검색 (email/phone 은 암호화 저장이라 검색 제외) */
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private LocalDate searchFromDate;
-
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	private LocalDate searchToDate;
-}

src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalnotice/PortalNoticeService.java

@@ -13,16 +13,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 
-import java.util.List;
-
 @Service
 @Transactional(transactionManager = "transactionManagerForEMS")
 public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, String, PortalNoticeRepository> {
 
-	public void deleteByIds(List<String> ids) {
-		repository.deleteAllById(ids);
-	}
-
 	public Page<PortalNotice> findAll(Pageable pageable, PortalNoticeUISearch portalNoticeUISearch) {
 		QPortalNotice qPortalNotice = QPortalNotice.portalNotice;
 

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

@@ -10,16 +10,10 @@ 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

@@ -8,14 +8,12 @@ import com.eactive.apim.portal.template.entity.QMessageRequest;
 import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.dsl.BooleanExpression;
-import com.querydsl.jpa.JPAExpressions;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -38,22 +36,7 @@ public class PortalUserService extends AbstractEMSDataSerivce<PortalUser, String
         }
 
         if (StringUtils.isNotBlank(portalUserUISearch.getSearchUserId())) {
-            // login_id / email_addr 는 PersonalDataEncryptConverter 로 암호화 저장되는 컬럼이다.
-            // 암호화는 부분문자열을 보존하지 않으므로 LIKE/contains 검색은 절대 매칭되지 않는다.
-            // 결정적(deterministic) 암호화라 정확일치(eq)만 가능하므로, login_id 와 email_addr 둘 다 정확일치로 OR 검색한다.
-            String searchUserId = portalUserUISearch.getSearchUserId().trim();
-            BooleanBuilder loginIdPredicate = new BooleanBuilder()
-                    .or(qPortalUser.loginId.eq(searchUserId))
-                    .or(qPortalUser.emailAddr.eq(searchUserId));
-            // 이메일 형식 값(예: user+1@unit-test.com)은 form-urlencoded 디코딩 과정에서
-            // '+' 가 공백으로 치환되어 전달될 수 있다(프록시/컨테이너 단계라 앱에서 인코딩만으로 막기 어려움).
-            // login_id/email 에는 공백이 올 수 없으므로, 공백 포함 검색어는 '+' 치환 값도 함께 매칭한다.
-            if (searchUserId.indexOf(' ') >= 0) {
-                String plusRestored = searchUserId.replace(' ', '+');
-                loginIdPredicate.or(qPortalUser.loginId.eq(plusRestored))
-                        .or(qPortalUser.emailAddr.eq(plusRestored));
-            }
-            predicate.and(loginIdPredicate);
+            predicate.and(qPortalUser.loginId.containsIgnoreCase(portalUserUISearch.getSearchUserId()));
         }
 
         if (StringUtils.isNotBlank(portalUserUISearch.getSearchUserName())) {
@@ -64,49 +47,16 @@ public class PortalUserService extends AbstractEMSDataSerivce<PortalUser, String
             predicate.and(qPortalUser.portalOrg.id.eq(portalUserUISearch.getSearchOrgId()));
         }
         if (StringUtils.isNotBlank(portalUserUISearch.getSearchMobileNumber())) {
-            // mobile_number 도 암호화 저장 컬럼이라 부분문자열이 보존되지 않는다.
-            // LIKE/contains 는 매칭되지 않으므로 정확일치(eq)로만 검색한다.
-            predicate.and(qPortalUser.mobileNumber.eq(portalUserUISearch.getSearchMobileNumber().trim()));
+            predicate.and(qPortalUser.mobileNumber.contains(portalUserUISearch.getSearchMobileNumber()));
         }
 
         if (StringUtils.isNotBlank(portalUserUISearch.getSearchRoleCode())) {
             predicate.and(qPortalUser.roleCode.eq(PortalUserEnums.RoleCode.valueOf(portalUserUISearch.getSearchRoleCode())));
         }
 
-        // 휴대폰번호 중복(2명 이상 공유) 사용자만 조회
-        if (portalUserUISearch.isOnlyDuplicateMobile()) {
-            // 자바 리스트 .in() 은 컨버터가 IN 파라미터를 암호화하므로 레거시 평문 데이터와 매칭되지 않는다.
-            // 대신 서브쿼리 .in() 으로 컬럼 대 컬럼(SQL 내부) 비교를 하여 평문/암호문 저장 방식과 무관하게 동작시킨다.
-            QPortalUser dupUser = new QPortalUser("dupUser");
-            predicate.and(qPortalUser.mobileNumber.in(
-                    JPAExpressions.select(dupUser.mobileNumber)
-                            .from(dupUser)
-                            .where(dupUser.mobileNumber.isNotNull()
-                                    .and(dupUser.userStatus.ne(PortalUserEnums.UserStatus.REMOVED)))
-                            .groupBy(dupUser.mobileNumber)
-                            .having(dupUser.count().gt(1L))));
-        }
-
         return repository.findAll(predicate, pageable);
     }
 
-    /**
-     * 휴대폰번호가 중복되는 사용자 총 인원수(중복 그룹에 속한 사용자 수의 합)를 반환한다.
-     */
-    public long countDuplicateMobileUsers() {
-        QPortalUser qPortalUser = QPortalUser.portalUser;
-        // Oracle 빈 문자열=NULL 이슈로 isNotNull 만 사용 (findDuplicateMobileNumbers 와 동일 기준)
-        List<Long> duplicateGroupCounts = getJPAQueryFactory()
-                .select(qPortalUser.count())
-                .from(qPortalUser)
-                .where(qPortalUser.mobileNumber.isNotNull()
-                        .and(qPortalUser.userStatus.ne(PortalUserEnums.UserStatus.REMOVED)))
-                .groupBy(qPortalUser.mobileNumber)
-                .having(qPortalUser.count().gt(1L))
-                .fetch();
-        return duplicateGroupCounts.stream().mapToLong(Long::longValue).sum();
-    }
-
     public boolean existsByLoginId(String loginId) {
         BooleanExpression predicate = QPortalUser.portalUser.loginId.eq(loginId);
         return repository.exists(predicate);
@@ -127,10 +77,6 @@ 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/data/entity/onl/apim/portaluser/PortalUserUISearch.java

@@ -23,7 +23,4 @@ public class PortalUserUISearch {
 
 	private boolean includeRemoved;
 
-	/** true 인 경우 휴대폰번호가 중복(2명 이상 공유)되는 사용자만 조회 */
-	private boolean onlyDuplicateMobile;
-
 }

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

@@ -26,12 +26,9 @@ public class WebhookSendLog {
     )
     private Long id;
 
-    @Column(name = "TARGET_URL", length = 500)
+    @Column(name = "TARGET_URL", nullable = false, length = 500)
     private String targetUrl;
 
-    @Column(name = "PROXY_URL", length = 500)
-    private String proxyUrl;
-
     @Column(name = "EVENT_TYPE", length = 100)
     private String eventType;
 
@@ -69,9 +66,6 @@ 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,15 +126,6 @@ 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/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java

@@ -5,9 +5,7 @@ import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,12 +42,7 @@ public class ExtendedColumnDefinitionService
 			predicate = predicate.and(qExtendedColumnDefinition.columnDesc.containsIgnoreCase(searchColumnDesc));
 		}
 
-		Pageable orderedPageable = PageRequest.of(
-				pageable.getPageNumber(),
-				pageable.getPageSize(),
-				Sort.by(Sort.Order.asc("orderSeq"), Sort.Order.asc("columnName")));
-
-		return repository.findAll(predicate, orderedPageable);
+		return repository.findAll(predicate, pageable);
 	}
 
 }

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

@@ -39,10 +39,11 @@ public interface ApiStatusRepository extends BaseRepository<ApiStatus, String> {
 	  + "   FROM ("
 	  + "     SELECT A.EAISVCNAME"
 	  + "          , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE"
-	  + "          , NVL(( SELECT MAX('Y') FROM EMSAPP.DJB_APISTATUS_INCIDENT_API X"
-	  + "                   WHERE EXISTS (SELECT 1 FROM EMSAPP.DJB_APISTATUS_INCIDENT Y WHERE X.INCIDENT_ID = Y.INCIDENT_ID "
-	  + "        	                       AND SYSTIMESTAMP BETWEEN STARTED_AT AND END_AT) "
-	  + "                     AND A.EAISVCNAME = X.API_ID),'N') AS CTRL_YN "
+	  //TODO: 게시판 임시로 생성하여 사용. 유차장이 완료하면 변경할것
+	  + "          , NVL(( SELECT 'Y' FROM PTL_NOTICE_API X "
+	  + "                   WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID)"
+	  //+ "                     AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) "
+	  + "                     AND A.EAISVCNAME = X.API_NAME),'N') AS CTRL_YN "
 	  + "          , (SELECT CASE WHEN TOTAL = 0 THEN 'X'"
 	  + "                         WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'"
 	  + "                    ELSE 'N' END"

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

@@ -15,7 +15,7 @@ import com.eactive.apim.portal.template.entity.MessageCode;
 import com.eactive.eai.rms.data.entity.man.role.Role;
 import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus;
 import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent;
-import com.eactive.eai.rms.ext.djb.ums.UmsManager;
+import com.eactive.eai.rms.ext.djb.util.UmsManager;
 
 
 @Service
@@ -26,10 +26,10 @@ public class ApiStatusService {
 
     @Autowired
     private ApiStatusRepository apiStatusRepository;
-
+    
     @Autowired
-    private UmsManager ums;
-
+    private UmsManager ums; 
+    
     @Autowired
     private ApiStatusDetectionService apiStatusDectionService;
     
@@ -55,8 +55,7 @@ public class ApiStatusService {
             apiStatus.setEaisvcname(event.getEaisvcname());
             apiStatus.setStatusCode(newStatusCode);
 
-            apiStatusRepository.saveAndFlush(apiStatus);  // PK 있으면 UPDATE, 없으면 INSERT (즉시 flush)
-            
+            apiStatusRepository.save(apiStatus);  // PK 있으면 UPDATE, 없으면 INSERT
             log.debug("API 상태 변경: {}-{} {} → {}", event.getEaisvcname(), event.getEaisvcdesc(), event.getEvent(), newStatusCode);
             
         	
@@ -76,8 +75,8 @@ public class ApiStatusService {
         	String event = entry.getKey();
 			List<String> apiIds = entry.getValue();
 			
-			HashMap<String, Object> params = getSwingChatMessage(event, apiIds);
-			ums.send("api-monitor", MessageCode.API_STATUS_CHANGED, params);
+			String message = getSwingChatMessage(event, apiIds);
+			ums.sendMessenger("api-monitor", MessageCode.API_STATUS_CHANGED, message);
 
             //제휴사 웹훅 발송
             ums.sendWebhook(event, apiIds);
@@ -103,7 +102,7 @@ public class ApiStatusService {
 	}
     
     
-    private HashMap<String, Object> getSwingChatMessage(String event, List<String> apiIds) {
+    private String getSwingChatMessage(String event, List<String> apiIds) {
     	String message = "";
     	switch (event) {
 	        case "CONTROL_START": 
@@ -126,18 +125,9 @@ public class ApiStatusService {
 	        	break;
 	        default:
 	        	message = "";
-	    }
+	    	}
     	
-    	if (apiIds.size() > 1) {
-    		message += "\n" + apiIds.get(0) + "외 " + (apiIds.size()-1) + "종"; 
-    	} else {
-    		message += "\n- " + apiIds.get(0);
-    	}
-    	
-    	HashMap<String, Object> params = new HashMap<>();
-		params.put("message", message);
-		
-		return params;
+    	return message + "\n- " + String.join(",", apiIds);
     }
 }