로고 및 스타일 변경 반영:

- 로고 사이즈 수정 (114px → 144px) 및 레이아웃 조정
- 컬러 및 폰트 스타일 Figma 가이드 기준 업데이트
- 버튼/배경 스타일 효과 개선 (글래스, 알약 태그 등)

Jenkinsfile.deploy

@@ -1,159 +1,220 @@
 pipeline {
-  agent none
+  agent { label 'djb-vm' }
 
   options {
     timestamps()
     disableConcurrentBuilds()
-    skipDefaultCheckout()   // stage별 agent의 자동 SCM checkout 방지 (Deploy 노드는 git 접근 불필요, unstash로만 WAR 수신)
     buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20'))
   }
 
   environment {
+    JAVA_HOME = '/apps/opts/jdk8'
+    JAVA_HOME_TOMCAT = '/apps/opts/jdk17'
+    GRADLE_HOME = '/apps/opts/gradle-8.7'
+    GRADLE_USER_HOME = '/apps/opts/gradle-home'
+    NODE_HOME = '/apps/opts/node-v24'
+    PATH = "/apps/opts/jdk8/bin:/apps/opts/gradle-8.7/bin:/apps/opts/node-v24/bin:/apps/opts/bin:${env.PATH}"
     GIT_SSH_COMMAND = 'ssh -o StrictHostKeyChecking=accept-new'
+    CATALINA_BASE = '/prod/eapim/devportal'
+    CATALINA_HOME = '/prod/eapim/apache-tomcat-9.0.116'
+    CATALINA_PID = '/prod/eapim/devportal/temp/catalina.pid'
+    DEPLOY_HTTP_PORT = '39130'
     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}"
+    stage('Checkout') {
+      steps {
+        checkout scm
       }
-      stages {
-        stage('Checkout') {
-          steps { checkout scm }
-        }
-        stage('Checkout dependencies') {
-          steps {
-            sh '''
-              set -eu
-              cd "$WORKSPACE/.."
-              if [ ! -d elink-portal-common/.git ]; then
-                rm -rf elink-portal-common
-                git clone --depth=1 --branch master \
-                  ssh://git@172.30.1.50:2222/djb-eapim/elink-portal-common.git elink-portal-common
-              else
-                git -C elink-portal-common fetch --depth=1 origin master
-                git -C elink-portal-common reset --hard origin/master
-                git -C elink-portal-common clean -fdx
-              fi
-              mkdir -p eapim-online
-              if [ ! -d eapim-online/elink-online-core-jpa/.git ]; then
-                rm -rf eapim-online/elink-online-core-jpa
-                git clone --depth=1 --branch master \
-                  ssh://git@172.30.1.50:2222/djb-eapim/elink-online-core-jpa.git eapim-online/elink-online-core-jpa
-              else
-                git -C eapim-online/elink-online-core-jpa fetch --depth=1 origin master
-                git -C eapim-online/elink-online-core-jpa reset --hard origin/master
-                git -C eapim-online/elink-online-core-jpa clean -fdx
-              fi
-            '''
-          }
-        }
-        stage('Verify toolchain') {
-          steps { sh 'set -eu; java -version; gradle --version' }
-        }
-        stage('Test') {
-          steps { sh 'gradle clean test --no-daemon -Pprofile=weblogic' }
-          post {
-            always {
-              junit allowEmptyResults: true, testResults: 'build/test-results/test/*.xml'
-              archiveArtifacts allowEmptyArchive: true, artifacts: 'build/reports/tests/test/**,build/test-results/test/**'
-            }
-          }
-        }
-        stage('Build WAR') {
-          steps { sh 'gradle build -x test --no-daemon -Pprofile=weblogic' }
-          post {
-            success {
-              sh '''
-                set -eu
-                cd build/libs
-                sha256sum eapim-portal.war > eapim-portal.war.sha256
-              '''
-              archiveArtifacts artifacts: 'build/libs/eapim-portal.war,build/libs/eapim-portal.war.sha256', fingerprint: true
-              stash name: 'war', includes: 'build/libs/eapim-portal.war'
-            }
-          }
+    }
+
+    stage('Checkout dependencies') {
+      steps {
+        sh '''
+          set -eu
+          cd "$WORKSPACE/.."
+
+          if [ ! -d elink-portal-common/.git ]; then
+            rm -rf elink-portal-common
+            git clone --depth=1 --branch master \
+              ssh://git@172.30.1.50:2222/djb-eapim/elink-portal-common.git \
+              elink-portal-common
+          else
+            git -C elink-portal-common fetch --depth=1 origin master
+            git -C elink-portal-common reset --hard origin/master
+            git -C elink-portal-common clean -fdx
+          fi
+
+          mkdir -p eapim-online
+          if [ ! -d eapim-online/elink-online-core-jpa/.git ]; then
+            rm -rf eapim-online/elink-online-core-jpa
+            git clone --depth=1 --branch master \
+              ssh://git@172.30.1.50:2222/djb-eapim/elink-online-core-jpa.git \
+              eapim-online/elink-online-core-jpa
+          else
+            git -C eapim-online/elink-online-core-jpa fetch --depth=1 origin master
+            git -C eapim-online/elink-online-core-jpa reset --hard origin/master
+            git -C eapim-online/elink-online-core-jpa clean -fdx
+          fi
+        '''
+      }
+    }
+
+    stage('Verify toolchain') {
+      steps {
+        sh '''
+          set -eu
+          java -version
+          gradle --version
+        '''
+      }
+    }
+
+    stage('Test') {
+      steps {
+        sh 'gradle clean test --no-daemon'
+      }
+      post {
+        always {
+          junit allowEmptyResults: true, testResults: 'build/test-results/test/*.xml'
+          archiveArtifacts allowEmptyArchive: true, artifacts: 'build/reports/tests/test/**,build/test-results/test/**'
         }
       }
     }
 
-    stage('Deploy (weblogic)') {
-      agent { label 'weblogic' }
-      environment {
-        JENKINS_NODE_COOKIE = 'dontKillMe'          // background weblogic를 빌드 종료 시 죽이지 않게
-        WL_HOME       = '/app/eapim/devportal'
-        WL_DEPLOY_DIR = '/app/eapim/devportal'
-        WL_WAR_NAME   = 'eapim-portal.war'
-        WL_HTTP_PORT  = '39130'
-        WL_NOHUP      = '/logs/weblogic/domains/eapimDomain/nohup.devSvr11.out'
+    stage('Build WAR') {
+      steps {
+        sh 'gradle build -x test --no-daemon'
       }
-      stages {
-        stage('Stop WebLogic') {
-          steps {
-            sh '"$WL_HOME/stopDev11.sh"'            // 동기: 완전 종료까지 블록, 미기동 시에도 안전
-          }
+      post {
+        success {
+          sh '''
+            set -eu
+            cd build/libs
+            for f in eapim-portal.war eapim-portal-boot.war; do
+              sha1sum "$f" > "$f.sha1"
+              sha256sum "$f" > "$f.sha256"
+              md5sum "$f" > "$f.md5"
+            done
+          '''
+          archiveArtifacts artifacts: 'build/libs/eapim-portal.war,build/libs/eapim-portal-boot.war,build/libs/eapim-portal.war.sha1,build/libs/eapim-portal.war.sha256,build/libs/eapim-portal.war.md5,build/libs/eapim-portal-boot.war.sha1,build/libs/eapim-portal-boot.war.sha256,build/libs/eapim-portal-boot.war.md5', fingerprint: true
         }
-        stage('Deploy WAR') {
-          steps {
-            unstash 'war'
-            sh '''
-              set -eu
-              cp build/libs/eapim-portal.war "$WL_DEPLOY_DIR/$WL_WAR_NAME"
-              ls -la "$WL_DEPLOY_DIR"
-            '''
-          }
-        }
-        stage('Start WebLogic and readiness') {
-          steps {
-            sh '''
-              set -eu
-              "$WL_HOME/startDev11.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/health/ready" 2>/dev/null || echo "000")
-                [ "$STATUS" = "200" ] && { echo "Readiness OK (/health/ready)"; break; }
-                sleep 3
-              done
+    stage('Stop Tomcat') {
+      steps {
+        sh '''
+          set +e
+          systemctl --user stop eapim-portal 2>/dev/null
 
-              if [ "$STATUS" != "200" ]; then
-                echo "Readiness failed within 300s, last HTTP=$STATUS"
-                [ -f "$WL_NOHUP" ] && tail -120 "$WL_NOHUP"
-                exit 1
+          if [ -f "$CATALINA_PID" ] && kill -0 "$(cat "$CATALINA_PID")" 2>/dev/null; then
+            JAVA_HOME="$JAVA_HOME_TOMCAT" "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
+            for i in $(seq 1 30); do
+              [ -f "$CATALINA_PID" ] && kill -0 "$(cat "$CATALINA_PID")" 2>/dev/null || break
+              sleep 1
+            done
+          fi
+          rm -f "$CATALINA_PID"
+        '''
+      }
+    }
+
+    stage('Deploy ROOT.war') {
+      steps {
+        sh '''
+          set -eu
+          DEPLOY_DIR="$CATALINA_BASE/webapps"
+          rm -rf "$DEPLOY_DIR/ROOT" "$DEPLOY_DIR/ROOT.war"
+          cp build/libs/eapim-portal.war "$DEPLOY_DIR/ROOT.war"
+          ls -la "$DEPLOY_DIR"
+        '''
+      }
+    }
+
+    stage('Start Tomcat and readiness') {
+      steps {
+        sh '''
+          set -eu
+          LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log"
+          BEFORE=0
+          [ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG")
+
+          systemctl --user start eapim-portal
+
+          DEADLINE=$(($(date +%s) + 120))
+          LIVE_OK=0
+          STATUS=000
+
+          while [ "$(date +%s)" -lt "$DEADLINE" ]; do
+            if [ "$LIVE_OK" = "0" ]; then
+              LIVE=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \
+                "http://localhost:$DEPLOY_HTTP_PORT/health" 2>/dev/null || echo "000")
+              if [ "$LIVE" = "200" ]; then
+                echo "Liveness OK (/health)"
+                LIVE_OK=1
               fi
-            '''
-          }
-        }
+            fi
+
+            if [ "$LIVE_OK" = "1" ]; then
+              STATUS=$(curl -sS -o /tmp/eapim-ready-body.json -w '%{http_code}' --max-time 3 \
+                "http://localhost:$DEPLOY_HTTP_PORT/health/ready" 2>/dev/null || echo "000")
+              if [ "$STATUS" = "200" ]; then
+                echo "Readiness OK (/health/ready)"
+                cat /tmp/eapim-ready-body.json
+                echo
+                break
+              fi
+            fi
+
+            if [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | grep -qE "Application listener .* Exception|SEVERE.*startup.Catalina"; then
+              echo "Startup error detected in log"
+              tail -c +$((BEFORE+1)) "$LOG" | tail -80
+              exit 1
+            fi
+            sleep 2
+          done
+
+          if [ "$STATUS" != "200" ]; then
+            echo "Readiness probe failed within 120s, last HTTP status: $STATUS"
+            [ -f /tmp/eapim-ready-body.json ] && cat /tmp/eapim-ready-body.json && echo
+            [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -100
+            exit 1
+          fi
+
+          echo "--- key boot log lines ---"
+          tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true
+        '''
       }
     }
   }
 
   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"
-        '''
-      }
+      sh '''
+        set +e
+        payload=$(printf '{"text":"[%s #%s](%s) SUCCESS","attachments":[{"color":"good","fields":[{"title":"Job","value":"%s","short":true},{"title":"Build","value":"%s","short":true},{"title":"Result","value":"SUCCESS","short":true}]}]}' \
+          "$JOB_NAME" "$BUILD_NUMBER" "$BUILD_URL" "$JOB_NAME" "$BUILD_NUMBER")
+        curl -sS --fail --max-time 5 \
+          -H 'Content-Type: application/json' \
+          -X POST \
+          --data "$payload" \
+          "$WEBHOOK_URL" >/dev/null || echo "Webhook delivery failed for SUCCESS"
+      '''
     }
     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"
-        '''
-      }
+      sh '''
+        set +e
+        payload=$(printf '{"text":"[%s #%s](%s) FAILURE","attachments":[{"color":"danger","fields":[{"title":"Job","value":"%s","short":true},{"title":"Build","value":"%s","short":true},{"title":"Result","value":"FAILURE","short":true}]}]}' \
+          "$JOB_NAME" "$BUILD_NUMBER" "$BUILD_URL" "$JOB_NAME" "$BUILD_NUMBER")
+        curl -sS --fail --max-time 5 \
+          -H 'Content-Type: application/json' \
+          -X POST \
+          --data "$payload" \
+          "$WEBHOOK_URL" >/dev/null || echo "Webhook delivery failed for FAILURE"
+      '''
     }
   }
+
 }

build.gradle

@@ -30,12 +30,9 @@ dependencies {
 
 	implementation 'com.eactive.elink.common:elink-common-data:4.5.5'
 
-    // OpenAPI 3.0/3.1 spec 지원 (Nexus/Maven 해석). 기존 libs/swagger fileTree 대체.
-    // swagger 최신 릴리스(2.2.52/2.1.45)도 SpecVersion 은 V30/V31 까지만 — OpenAPI 3.2 는
-    // 아직 swagger-core/parser 어느 버전도 미지원. 지원 추가 시 버전만 상향하면 됨. JDK8 호환.
-    implementation 'io.swagger.core.v3:swagger-core:2.2.52'      // io.swagger.v3.oas.models.*, io.swagger.v3.core.util.Json
-    implementation 'io.swagger.parser.v3:swagger-parser:2.1.45'  // io.swagger.parser.OpenAPIParser, io.swagger.v3.parser.*
-    implementation 'io.swagger:swagger-annotations:1.6.14'       // io.swagger.annotations.ApiModelProperty (CommissionSearch)
+//    implementation 'io.swagger.core.v3:swagger-core:2.2.25'
+//    implementation 'io.swagger.parser.v3:swagger-parser:2.1.23'
+    implementation fileTree(dir: 'libs/swagger', include: ['*.jar'])
 
     implementation project(':elink-online-core-jpa')
     implementation project(':elink-portal-common')

package-lock.json

@@ -8,6 +8,9 @@
       "name": "eapim-portal",
       "version": "1.0.0",
       "license": "ISC",
+      "dependencies": {
+        "playwright": "^1.61.1"
+      },
       "devDependencies": {
         "sass": "^1.69.5"
       }
@@ -349,6 +352,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/immutable": {
       "version": "5.1.5",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
@@ -403,6 +420,36 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.61.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.1.tgz",
+      "integrity": "sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.61.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.61.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.1.tgz",
+      "integrity": "sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/readdirp": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",

package.json

@@ -13,5 +13,8 @@
     "sass": "^1.69.5"
   },
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "dependencies": {
+    "playwright": "^1.61.1"
+  }
 }

script/portal/oracle/6_ptl_two_factor_auth_recipient_key.sql

@@ -1,23 +0,0 @@
--- =============================================================================
--- 2FA 인증코드 조회용 결정적 해시 키 컬럼 추가
--- 대상: EMS 스키마 소유자(EMSAPP 등)로 접속하여 실행
--- 엔티티: com.eactive.apim.portal.portaluser.entity.TwoFactorAuth
---
--- 배경: RECIPIENT(이메일/휴대폰) 컬럼에 PersonalDataEncryptConverter 암호화가
---       적용되면서, 값 동등 조회(WHERE RECIPIENT = ?)와 중복정리가 깨져
---       인증코드 검증이 "일치하지 않습니다"로 실패함.
--- 해결: RECIPIENT 는 암호화 보관(감사/표시용)을 유지하고, 평문의 결정적 해시
---       (HMAC-SHA256, 소문자 hex 64자)를 RECIPIENT_KEY 에 저장하여 조회/정리에 사용.
---
--- ※ hibernate.hbm2ddl.auto=validate 이므로, 신규 엔티티 배포(재기동) "전"에
---    반드시 이 스크립트를 먼저 실행해야 기동 검증을 통과함.
--- =============================================================================
-
-ALTER TABLE PTL_TWO_FACTOR_AUTH ADD (RECIPIENT_KEY VARCHAR2(64));
-
--- 인증코드 조회/중복정리는 RECIPIENT_KEY 기준
-CREATE INDEX IX_PTL_TWO_FACTOR_AUTH_RKEY ON PTL_TWO_FACTOR_AUTH (RECIPIENT_KEY);
-
-COMMENT ON COLUMN PTL_TWO_FACTOR_AUTH.RECIPIENT_KEY IS '수신자 결정적 해시 조회키 (HMAC-SHA256 hex). RECIPIENT 암호화로 깨지는 동등조회/중복정리용';
-
-COMMIT;

src/main/java/com/eactive/apim/portal/apps/apis/controller/TestbedSpecController.java

@@ -2,15 +2,15 @@ package com.eactive.apim.portal.apps.apis.controller;
 
 import com.eactive.apim.portal.apispec.entity.ApiSpecInfo;
 import com.eactive.apim.portal.apispec.service.ApiSpecInfoService;
-import com.eactive.apim.portal.djb.testbed.service.DjbTestbedSpecServerRewriter;
+import com.eactive.apim.portal.apps.apis.service.ApiService;
+import com.eactive.apim.portal.apps.apiservice.service.ApiSpecService;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.FileCopyUtils;
@@ -22,45 +22,35 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/api/apis")
-@RequiredArgsConstructor
 @Slf4j
 public class TestbedSpecController {
 
-    private final ApiSpecInfoService apiSpecInfoService;
-    private final DjbTestbedSpecServerRewriter serverRewriter;
+    @Autowired
+    private ApiSpecInfoService apiSpecInfoService;
 
     private static final String DEFAULT_TOKEN_API_ID = "default-token-api-spec";
     private static final String DEFAULT_SPEC_PATH = "swagger/default-token-api-spec.json";
 
     @GetMapping(value = "/{id}/swagger.json", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> getSwagger(@PathVariable String id, HttpServletRequest request) {
-        String json = buildSpecJson(id, request);
-        return json == null ? ResponseEntity.notFound().build() : ResponseEntity.ok(json);
-    }
+    public ResponseEntity<String> getSwagger(@PathVariable String id) {
 
-    @GetMapping(value = "/{id}/swagger.yaml", produces = "application/x-yaml")
-    public ResponseEntity<String> getSwaggerYaml(@PathVariable String id, HttpServletRequest request) {
-        String json = buildSpecJson(id, request);
-        return json == null ? ResponseEntity.notFound().build() : ResponseEntity.ok(serverRewriter.toYaml(json));
-    }
-
-    /** default 토큰 spec 또는 저장 spec(서버 sentinel → 설정별 실주소 치환)을 JSON 으로 반환. 없으면 null. */
-    private String buildSpecJson(String id, HttpServletRequest request) {
         if (DEFAULT_TOKEN_API_ID.equals(id)) {
             try {
                 Resource resource = new ClassPathResource(DEFAULT_SPEC_PATH);
-                String content = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()), StandardCharsets.UTF_8);
-                return serverRewriter.rewriteServer(content, null, request);
+                String content = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
+                return ResponseEntity.ok().body(content);
             } catch (IOException e) {
                 log.error("Failed to read default token api spec file", e);
-                return null;
+                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
             }
         }
 
         Optional<ApiSpecInfo> spec = apiSpecInfoService.findById(id);
-        if (!spec.isPresent() || !StringUtils.hasText(spec.get().getTestbedSpec())) {
-            return null;
+
+        if (!spec.isPresent()) {
+            StringUtils.hasText(spec.get().getTestbedSpec());
         }
-        return serverRewriter.rewriteServer(spec.get().getTestbedSpec(), spec.get(), request);
+        return ResponseEntity.ok().body(spec.get().getTestbedSpec());
+
     }
 }

src/main/java/com/eactive/apim/portal/apps/apis/filter/APISender.java

@@ -1,6 +1,5 @@
 package com.eactive.apim.portal.apps.apis.filter;
 
-import com.eactive.apim.portal.djb.testbed.config.DjbTestbedGatewayProperty;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -21,20 +20,6 @@ public class APISender {
 
     private static final Logger logger = LoggerFactory.getLogger(APISender.class);
 
-    // 테스트베드 프록시 연결/응답 타임아웃 — DjbTestbedGatewayProperty(djb.gateway.timeout, 단위: 초) 단일 기준.
-    private final DjbTestbedGatewayProperty gatewayProperty;
-
-    public APISender(DjbTestbedGatewayProperty gatewayProperty) {
-        this.gatewayProperty = gatewayProperty;
-    }
-
-    /** connect/read 타임아웃 적용. 반드시 connect(getOutputStream/getResponseCode) 이전에 호출. */
-    private void applyTimeout(HttpURLConnection connection) {
-        int t = gatewayProperty.timeoutMillis();
-        connection.setConnectTimeout(t);
-        connection.setReadTimeout(t);
-    }
-
     public String requestPost(String uri, String requestBody) throws IOException {
 
         HttpURLConnection connection = getHttpURLConnection(uri, requestBody);
@@ -73,7 +58,6 @@ public class APISender {
 
         URL endpoint = new URL(appendUriAndParams(uri, params));
         HttpURLConnection connection = (HttpURLConnection) endpoint.openConnection();
-        applyTimeout(connection);
         connection.setRequestMethod("GET");
         connection.setRequestProperty("Accept", "application/json");
         for (Map.Entry<String, String> entry : headers.entrySet()) {
@@ -98,7 +82,6 @@ public class APISender {
 
         URL endpoint = new URL(appendUriAndParams(uri, params));
         HttpURLConnection connection = (HttpURLConnection) endpoint.openConnection();
-        applyTimeout(connection);
         connection.setRequestMethod("POST");
 
         for (Map.Entry<String, String> entry : headers.entrySet()) {
@@ -142,11 +125,10 @@ public class APISender {
         return response.toString();
     }
 
-    private HttpURLConnection getHttpURLConnection(String uri, String requestBody) throws IOException {
+    private static HttpURLConnection getHttpURLConnection(String uri, String requestBody) throws IOException {
         URL endpoint = new URL(uri);
 
         HttpURLConnection connection = (HttpURLConnection) endpoint.openConnection();
-        applyTimeout(connection);
 
         connection.setRequestMethod("POST");
         connection.setRequestProperty("Content-Type", "application/json; charset=utf-8");

src/main/java/com/eactive/apim/portal/apps/apis/filter/ApiTesterFilter.java

@@ -4,8 +4,6 @@ package com.eactive.apim.portal.apps.apis.filter;
 import com.eactive.apim.portal.apps.apis.dto.ApiSpecInfoDto;
 import com.eactive.apim.portal.apps.apis.service.ApiService;
 import com.eactive.apim.portal.common.util.ApplicationContextUtil;
-import com.eactive.apim.portal.djb.testbed.config.DjbTestbedGatewayProperty;
-import com.eactive.apim.portal.djb.testbed.enums.DjbGatewayMode;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.net.URI;
@@ -22,7 +20,6 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,23 +65,7 @@ public class ApiTesterFilter implements Filter {
         ApiService apiSpecInfoDtoService = ApplicationContextUtil.getContext().getBean(ApiService.class);
         String url = httpServletRequest.getHeader("original-url");
 
-        // original-url 헤더가 없으면 프록시 대상을 알 수 없음 → 400 (NPE 방지)
-        if (url == null || url.trim().isEmpty()) {
-            writeJson(response, HttpServletResponse.SC_BAD_REQUEST, "{\"error\":\"original-url 헤더가 없습니다.\"}");
-            return;
-        }
-
-        // 실제 프록시 호출(토큰/gw/mock)은 네트워크 오류·타임아웃도 응답 content-type(JSON)에 맞춰
-        // 반환하기 위해 try 로 감싼다.
-        try {
-
-        // 게이트웨이 모드에 따라 OAuth 토큰 발급 요청을 mock 또는 실 게이트웨이 forward 로 분기 (DJPGPT0001)
-        DjbTestbedGatewayProperty gatewayProperty = ApplicationContextUtil.getContext().getBean(DjbTestbedGatewayProperty.class);
-        DjbGatewayMode gatewayMode = gatewayProperty.resolveGatewayMode();
-        boolean tokenRequest = url.contains(DjbTestbedGatewayProperty.PORTAL_MOCK_TOKEN_PATH)
-                || url.contains(gatewayProperty.tokenPath());
-
-        if (tokenRequest) {
+        if (url.contains("/api/v1/oauth/token")){
             StringBuilder sb = new StringBuilder();
             BufferedReader reader = httpServletRequest.getReader();
             String line;
@@ -93,174 +74,82 @@ public class ApiTesterFilter implements Filter {
             }
             String body = sb.toString();
 
-            if (gatewayMode == DjbGatewayMode.PORTAL_MOCK) {
-                // PortalMock: 고정 mock 토큰 반환 (기존 동작 유지)
-                Map<String, String> params = new HashMap<>();
-                String[] pairs = body.split("&");
-                for (String pair : pairs) {
-                    String[] keyValue = pair.split("=");
-                    if (keyValue.length == 2) {
-                        params.put(keyValue[0], keyValue[1]);
-                    }
+            // Parse request parameters
+            Map<String, String> params = new HashMap<>();
+            String[] pairs = body.split("&");
+            for (String pair : pairs) {
+                String[] keyValue = pair.split("=");
+                if (keyValue.length == 2) {
+                    params.put(keyValue[0], keyValue[1]);
                 }
-                String scope = params.getOrDefault("scope", "default");
-
-                String token = "{\n" +
-                        "  \"access_token\": \"djbank_gw_sample_token\",\n" +
-                        "  \"token_type\": \"bearer\",\n" +
-                        "  \"expires_in\": 86400,\n" +
-                        "  \"scope\": \""+scope +"\",\n" +
-                        "  \"jti\": \""+ UUID.randomUUID().toString()+"\"\n" +
-                        "}";
-
-                response.setContentType("application/json");
-                response.getWriter().println(token);
-            } else {
-                // GATEWAY: 실 게이트웨이 토큰 엔드포인트로 forward (token 발급만)
-                APISender apiSender = ApplicationContextUtil.getContext().getBean(APISender.class);
-                Map<String, String> headers = new HashMap<>();
-                headers.put("Content-Type", "application/x-www-form-urlencoded");
-                headers.put("Accept", "application/json");
-                String target = gatewayProperty.baseUrl() + gatewayProperty.tokenPath();
-                String tokenResponse = apiSender.requestPost(target, headers, new HashMap<>(), body);
-
-                response.setContentType("application/json");
-                response.getWriter().println(tokenResponse);
             }
+            String scope = params.getOrDefault("scope", "default");
+
+            String token = "{\n" +
+                    "  \"access_token\": \"djbank_gw_sample_token\",\n" +
+                    "  \"token_type\": \"bearer\",\n" +
+                    "  \"expires_in\": 86400,\n" +
+                    "  \"scope\": \""+scope +"\",\n" +
+                    "  \"jti\": \""+ UUID.randomUUID().toString()+"\"\n" +
+                    "}";
+
+            response.setContentType("application/json");
+            response.getWriter().println(token);
 
         } else {
             ApiSpecInfoDto apiSpecInfoDto = apiSpecInfoDtoService.selectDetailByURLAndMethod(parseUri(url), httpServletRequest.getMethod());
 
-            // URL/메서드에 해당하는 API 명세가 없으면 404 (NPE 방지)
-            if (apiSpecInfoDto == null) {
-                writeJson(response, HttpServletResponse.SC_NOT_FOUND,
-                        "{\"error\":\"해당 URL/메서드의 API 명세를 찾을 수 없습니다.\"}");
-                return;
-            }
-
-            String responseType = apiSpecInfoDto.getResponseType();
-
-            // sample(기본): 저장된 샘플 응답 반환 (실호출 없음)
-            if (responseType == null || responseType.equalsIgnoreCase("sample")) {
+            if (apiSpecInfoDto.getResponseType() == null || apiSpecInfoDto.getResponseType().equals("sample")) {
                 response.setContentType("application/json");
                 response.getWriter().println(apiSpecInfoDto.getSampleResponse());
-                return;
-            }
-
-            // gw / mock: 실주소로 forward. swagger 서버 표시(DjbTestbedSpecServerRewriter)와 동일하게 맞춘다.
-            //   - gw   : djb.gateway.base-url + path == original-url 전체 (spec servers[0].url + path)
-            //   - mock : ApiSpecInfo.mockUrl (기존 동작)
-            boolean gw = "gw".equalsIgnoreCase(responseType);
-
-            Map<String, String> headers = new HashMap<>();
-            Enumeration<String> headerNames = httpServletRequest.getHeaderNames();
-            while (headerNames.hasMoreElements()) {
-                String header = headerNames.nextElement();
-                headers.put(header, httpServletRequest.getHeader(header));
-            }
-            headers.remove("original-url");
-            headers.remove("original-api-id");
-
-            String targetUri;
-            Map<String, String[]> paramMap;
-            if (gw) {
-                // original-url 이 이미 (게이트웨이주소 + path + query) 전체이므로 그대로 대상 URL 로 사용.
-                // 프록시 대상 호스트가 바뀌므로 Host 헤더는 제거해 대상 호스트로 자동 설정되게 한다.
-                headers.remove("host");
-                headers.remove("Host");
-                targetUri = url;
-                paramMap = new HashMap<>();
             } else {
-                // mock: 저장된 mockUrl 로 forward하고, original-url 의 쿼리스트링을 재부착 (기존 동작 유지)
-                targetUri = apiSpecInfoDto.getMockUrl();
-                paramMap = extractQueryParams(url);
-            }
+                String mockUrl = apiSpecInfoDto.getMockUrl();
+                String method = apiSpecInfoDto.getApiMethod();
+                Enumeration<String> headerNames = httpServletRequest.getHeaderNames();
 
-            APISender apiSender = ApplicationContextUtil.getContext().getBean(APISender.class);
-            String responseStr;
-            if ("post".equalsIgnoreCase(apiSpecInfoDto.getApiMethod())) {
-                responseStr = apiSender.requestPost(targetUri, headers, paramMap, readBody(httpServletRequest));
-            } else {
-                responseStr = apiSender.requestGet(targetUri, headers, paramMap);
-            }
-            response.setContentType("application/json");
-            response.getWriter().println(responseStr);
-        }
-
-        } catch (java.net.SocketTimeoutException e) {
-            // 연결/응답 타임아웃 (djb.gateway.timeout 초과)
-            logger.warn("테스트베드 프록시 타임아웃: {}", e.getMessage());
-            writeJson(response, HttpServletResponse.SC_GATEWAY_TIMEOUT,
-                    "{\"error\":\"게이트웨이 응답 시간 초과(timeout)\",\"detail\":\"" + escapeJson(e.getMessage()) + "\"}");
-        } catch (IOException e) {
-            // 연결 실패 등 네트워크 오류
-            logger.error("테스트베드 프록시 호출 실패", e);
-            writeJson(response, HttpServletResponse.SC_BAD_GATEWAY,
-                    "{\"error\":\"게이트웨이 호출 실패\",\"detail\":\"" + escapeJson(e.getMessage()) + "\"}");
-        } catch (Exception e) {
-            // 그 외 예기치 못한 오류도 JSON 으로 반환
-            logger.error("테스트베드 프록시 처리 오류", e);
-            writeJson(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-                    "{\"error\":\"요청 처리 중 오류\",\"detail\":\"" + escapeJson(e.getMessage()) + "\"}");
-        }
-    }
-
-    /** 요청 본문 전체를 문자열로 읽는다. */
-    private String readBody(HttpServletRequest request) throws IOException {
-        StringBuilder sb = new StringBuilder();
-        BufferedReader reader = request.getReader();
-        String line;
-        while ((line = reader.readLine()) != null) {
-            sb.append(line);
-        }
-        return sb.toString();
-    }
-
-    /** original-url 의 쿼리스트링(?a=1&b=2)을 파라미터 맵으로 파싱. */
-    private Map<String, String[]> extractQueryParams(String originalUrl) {
-        Map<String, String[]> paramMap = new HashMap<>();
-        String[] parts = originalUrl.split("\\?");
-        if (parts.length > 1) {
-            for (String param : parts[1].split("&")) {
-                String[] kv = param.split("=");
-                if (kv.length > 1) {
-                    paramMap.put(kv[0], new String[]{kv[1]});
+                Map<String, String> headers = new HashMap<>();
+                while (headerNames.hasMoreElements()) {
+                    String header = headerNames.nextElement();
+                    headers.put(header, httpServletRequest.getHeader(header));
                 }
-            }
-        }
-        return paramMap;
-    }
+                Map<String, String[]> paramMap = new HashMap<>();
 
-    /** 상태코드 + JSON 본문 응답. */
-    private void writeJson(ServletResponse response, int status, String json) throws IOException {
-        ((HttpServletResponse) response).setStatus(status);
-        response.setContentType("application/json");
-        response.getWriter().println(json);
-    }
+                String originalUrl = headers.get("original-url");
+                //sprlit original url with ? get the second part then split with & put into paramMap
 
-    /** JSON 문자열 값에 넣기 위한 최소 escape (예외 메시지 등). */
-    private String escapeJson(String s) {
-        if (s == null) {
-            return "";
-        }
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-            switch (c) {
-                case '\\': sb.append("\\\\"); break;
-                case '"':  sb.append("\\\""); break;
-                case '\n': sb.append("\\n"); break;
-                case '\r': sb.append("\\r"); break;
-                case '\t': sb.append("\\t"); break;
-                default:
-                    if (c < 0x20) {
-                        sb.append(String.format("\\u%04x", (int) c));
-                    } else {
-                        sb.append(c);
+                String[] originalUrlArr = originalUrl.split("\\?");
+                if (originalUrlArr.length > 1) {
+                    String[] paramArr = originalUrlArr[1].split("&");
+                    for (String param : paramArr) {
+                        String[] paramKeyValue = param.split("=");
+                        if (paramKeyValue.length > 1) {
+                            paramMap.put(paramKeyValue[0], new String[]{paramKeyValue[1]});
+                        }
                     }
+                }
+
+                headers.remove("original-url");
+                headers.remove("original-api-id");
+                APISender apiSender = ApplicationContextUtil.getContext().getBean(APISender.class);
+
+                String responseStr = "";
+                if (method.equalsIgnoreCase("post")) {
+                    StringBuilder sb = new StringBuilder();
+                    BufferedReader reader = httpServletRequest.getReader();
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        sb.append(line);
+                    }
+                    String body = sb.toString();
+                    responseStr = apiSender.requestPost(mockUrl, headers, paramMap, body);
+
+                } else {
+                    responseStr = apiSender.requestGet(mockUrl, headers, paramMap);
+                }
+                response.setContentType("application/json");
+                response.getWriter().println(responseStr);
             }
         }
-        return sb.toString();
     }
 
     @Override

src/main/java/com/eactive/apim/portal/apps/app/controller/MyAppController.java

@@ -10,7 +10,6 @@ import com.eactive.apim.portal.apps.apiservice.service.ApiServiceService;
 import com.eactive.apim.portal.apps.app.dto.ApiKeyRegistrationDTO;
 import com.eactive.apim.portal.apps.app.dto.AppRequestDTO;
 import com.eactive.apim.portal.apps.app.dto.ClientDTO;
-import com.eactive.apim.portal.apps.app.service.AdminGatewayClient;
 import com.eactive.apim.portal.apps.app.service.AppServiceFacade;
 import com.eactive.apim.portal.common.user.PortalAuthenticatedUser;
 import com.eactive.apim.portal.common.util.ApiServiceHelper;
@@ -22,7 +21,6 @@ import java.util.Map;
 import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -46,7 +44,6 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-@Slf4j
 @Controller
 @RequestMapping("/myapikey")
 @RequiredArgsConstructor
@@ -80,7 +77,6 @@ public class MyAppController {
     private final ApiService apiService;
     private final ApiServiceHelper apiServiceHelper;
     private final FileTypeDetector fileTypeDetector;
-    private final AdminGatewayClient adminGatewayClient;
 
     private static final long MAX_APP_ICON_BYTES = 2L * 1024 * 1024; // 2MB
 
@@ -172,13 +168,7 @@ public class MyAppController {
             }
         });
 
-        // Client Secret은 초기 HTML에 담지 않는다. (비번 확인 후 서버가 1회만 반환)
-        boolean secretAvailable = StringUtils.isNotBlank(apiKey.getClientsecret());
-        apiKey.setClientsecret(null);
-
         model.addAttribute("apiKey", apiKey);
-        model.addAttribute("secretAvailable", secretAvailable);
-        model.addAttribute("authType", "OAuth2");
 
         return new ModelAndView(CREDENTIAL_DETAIL);
     }
@@ -238,45 +228,28 @@ public class MyAppController {
     public Map<String, Object> deleteApiKey(@RequestBody Map<String, String> requestData) {
         Map<String, Object> result = new java.util.HashMap<>();
 
-        String clientId = requestData.get("clientId");
-        if (clientId == null || clientId.trim().isEmpty()) {
-            result.put("success", false);
-            result.put("msg", "클라이언트 ID가 필요합니다.");
-            return result;
-        }
-
-        PortalAuthenticatedUser user = SecurityUtil.getPortalAuthenticatedUser();
-        String orgId = user.getPortalOrg().getId();
-
-        // 1. 소유권 확인 (다른 조직의 인증키 차단/삭제 방지)
-        if (appServiceFacade.getApiKey(orgId, clientId) == null) {
-            result.put("success", false);
-            result.put("msg", "해당 인증키를 찾을 수 없습니다.");
-            return result;
-        }
-
-        // 2. GW 차단(appstatus=0)+리로드를 admin 에 위임. 실패하면 포털 레코드를 삭제하지 않는다.
         try {
-            adminGatewayClient.blockClient(clientId);
-        } catch (Exception e) {
-            log.error("GW 차단/리로드 실패로 인증키 삭제 중단 - clientId={}", clientId, e);
-            result.put("success", false);
-            result.put("msg", "게이트웨이 차단 처리에 실패하여 삭제를 중단했습니다. 잠시 후 다시 시도해 주세요.");
-            return result;
-        }
+            String clientId = requestData.get("clientId");
+            String type = requestData.get("type");
 
-        // 3. GW 차단 성공 시에만 포털 credential 삭제
-        try {
-            appServiceFacade.deleteApp(orgId, clientId);
+            if (clientId == null || clientId.trim().isEmpty()) {
+                result.put("success", false);
+                result.put("msg", "클라이언트 ID가 필요합니다.");
+                return result;
+            }
+
+            PortalAuthenticatedUser user = SecurityUtil.getPortalAuthenticatedUser();
+
+            // API Key 즉시 삭제 (승인 프로세스 없이)
+            appServiceFacade.deleteApp(user.getPortalOrg().getId(), clientId);
+
+            result.put("success", true);
+            result.put("msg", "API Key가 삭제되었습니다.");
         } catch (Exception e) {
-            log.error("포털 credential 삭제 실패 - clientId={}", clientId, e);
             result.put("success", false);
             result.put("msg", "삭제 요청 중 오류가 발생했습니다: " + e.getMessage());
-            return result;
         }
 
-        result.put("success", true);
-        result.put("msg", "API Key가 삭제되었습니다.");
         return result;
     }
 
@@ -309,57 +282,6 @@ public class MyAppController {
         return result;
     }
 
-    /**
-     * Client Secret을 비밀번호 확인 후 1회 노출하고 즉시 DB에서 물리 삭제합니다.
-     * 보안 정책상 비밀정보는 최초 1회만 제공됩니다.
-     *
-     * @param requestData clientId, password 포함
-     * @return {success, secret} / {success:false, alreadyRevealed:true} / {success:false, message}
-     */
-    @PostMapping("/credential/reveal-secret")
-    @Secured("ROLE_APP")
-    @ResponseBody
-    public Map<String, Object> revealClientSecret(@RequestBody Map<String, String> requestData) {
-        Map<String, Object> result = new java.util.HashMap<>();
-
-        String clientId = requestData.get("clientId");
-        String password = requestData.get("password");
-
-        if (clientId == null || clientId.trim().isEmpty()) {
-            result.put("success", false);
-            result.put("message", "클라이언트 ID가 필요합니다.");
-            return result;
-        }
-
-        PortalAuthenticatedUser user = SecurityUtil.getPortalAuthenticatedUser();
-
-        // 1. 본인 확인 (비밀번호)
-        if (!appServiceFacade.verifyUserPassword(user, password)) {
-            result.put("success", false);
-            result.put("message", "비밀번호가 일치하지 않습니다.");
-            return result;
-        }
-
-        // 2. 소유권 확인 + 1회 노출 + 물리 삭제
-        try {
-            String secret = appServiceFacade.revealAndDeleteClientSecret(user.getPortalOrg().getId(), clientId);
-            if (secret == null) {
-                result.put("success", false);
-                result.put("alreadyRevealed", true);
-                result.put("message", "이미 1회 노출되어 삭제된 인증정보입니다.");
-                return result;
-            }
-            result.put("success", true);
-            result.put("secret", secret);
-        } catch (Exception e) {
-            log.error("Client Secret 노출 처리 실패 - clientId={}", clientId, e);
-            result.put("success", false);
-            result.put("message", "인증정보 조회 중 오류가 발생했습니다.");
-        }
-
-        return result;
-    }
-
     /**
      * API Key 요청 이력을 페이지 형태로 조회합니다.
      * 각 요청의 내용을 사용자 친화적인 형식으로 포맷팅하여 표시합니다.

src/main/java/com/eactive/apim/portal/apps/app/service/AdminGatewayClient.java

@@ -1,54 +0,0 @@
-package com.eactive.apim.portal.apps.app.service;
-
-import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
-import java.util.Map;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * 관리자(admin) 포털의 내부 API를 호출하는 클라이언트.
- *
- * <p>GW 인증서버(TSEAIAU01) 제어는 포털이 직접 하지 않고, broadcast 인프라를 갖춘 admin 에 위임한다.
- * admin base URL 은 {@code PTL_PROPERTY} (group={@code Portal}, name={@code djb.admin.base-url}) 에서 조회한다.</p>
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AdminGatewayClient {
-
-    private static final String PROP_GROUP = "Portal";
-    private static final String PROP_ADMIN_BASE_URL = "admin.base-url";
-    private static final String DEFAULT_ADMIN_BASE_URL = "http://localhost:39120";
-    private static final String CLIENT_BLOCK_PATH = "/onl/admin/authserver/clientBlock.json?clientId={clientId}";
-
-    private final RestTemplate restTemplate;
-    private final PortalPropertyService portalPropertyService;
-
-    /**
-     * clientId 의 GW 인증 클라이언트 차단(appstatus=0) + GW 캐시 리로드를 admin 에 요청한다.
-     *
-     * @param clientId 차단할 클라이언트 ID
-     * @throws RuntimeException admin 미응답/네트워크 오류 또는 admin 처리 실패 시 (호출측에서 처리)
-     */
-    public void blockClient(String clientId) {
-        String baseUrl = portalPropertyService.getOrCreateProperty(
-            PROP_GROUP, PROP_ADMIN_BASE_URL, DEFAULT_ADMIN_BASE_URL, "admin(관리자포털) 내부 API base URL");
-
-        String url = baseUrl.replaceAll("/+$", "") + CLIENT_BLOCK_PATH;
-
-        // 네트워크/HTTP 오류는 RestTemplate 이 예외로 던진다.
-        ResponseEntity<Map> response = restTemplate.postForEntity(url, null, Map.class, clientId);
-
-        Map<?, ?> body = response.getBody();
-        boolean success = body != null && Boolean.TRUE.equals(body.get("success"));
-        if (!success) {
-            String msg = body != null ? String.valueOf(body.get("msg")) : "응답 본문 없음";
-            throw new IllegalStateException("admin clientBlock 처리 실패 - clientId=" + clientId + ", msg=" + msg);
-        }
-
-        log.info("admin GW 차단/리로드 위임 성공 - clientId={}", clientId);
-    }
-}

src/main/java/com/eactive/apim/portal/apps/app/service/AppServiceFacade.java

@@ -293,29 +293,6 @@ public class AppServiceFacade {
         }
     }
 
-    /**
-     * Client Secret을 1회 조회하고 그 즉시 DB(PTL_CREDENTIAL)에서 물리 삭제합니다.
-     * 보안 정책상 비밀정보는 최초 1회만 제공되며, 조회 후에는 복구할 수 없습니다.
-     *
-     * @param orgId    조직 ID (소유권 확인용)
-     * @param clientId 대상 클라이언트 ID
-     * @return 삭제 전 Client Secret 값. 이미 노출되어 비어있으면 {@code null}
-     * @throws NotFoundException 클라이언트를 찾을 수 없는 경우
-     */
-    public String revealAndDeleteClientSecret(String orgId, String clientId) {
-        Credential credential = credentialRepository.findByClientidAndOrgid(clientId, orgId)
-            .orElseThrow(() -> new NotFoundException("Client not found: " + clientId));
-
-        String secret = credential.getClientsecret();
-        if (StringUtils.isBlank(secret)) {
-            return null; // 이미 1회 노출되어 삭제됨
-        }
-
-        credential.setClientsecret(null); // 물리 삭제 (1회 제공)
-        credentialRepository.save(credential);
-        return secret;
-    }
-
     /**
      * API Key(Credential)를 즉시 삭제합니다.
      * 승인 프로세스 없이 바로 삭제 처리됩니다.

src/main/java/com/eactive/apim/portal/apps/commission/constant/Constants.java

@@ -0,0 +1,26 @@
+package com.eactive.apim.portal.apps.commission.constant;
+
+/**
+ * Application constants.
+ */
+public final class Constants {
+
+    public static final String SYSTEM_ACCOUNT = "system";
+
+    public static final String APIM_FOR_OBP_KEY = "x-obp-trust-system";
+
+    public static final String APIM_CODE_FOR_OBP_KEY = "x-obp-partnercode";
+
+    public static final String SMS_URL = "/api/messaging/sms";
+
+    public static final String COMMISSION_URL = "/api/billing/billing/findBillingForCondition";
+
+    public static final String COMMISSION_PRINT_URL = "/api/billing/billing/findBillingForCondition/print";
+
+    public static final String OBP_ORGANIZATION_URL = "/api/customer/findCustomerByBusinessManRegistrationNo/";
+
+    public static String LANGUAGE = "ko";
+
+    private Constants() {
+    }
+}

src/main/java/com/eactive/apim/portal/apps/commission/controller/CommissionController.java

@@ -0,0 +1,320 @@
+package com.eactive.apim.portal.apps.commission.controller;
+
+import com.eactive.apim.portal.apps.commission.constant.Constants;
+import com.eactive.apim.portal.apps.commission.dto.CommissionDTO;
+import com.eactive.apim.portal.apps.commission.dto.CommissionSearch;
+import com.eactive.apim.portal.apps.commission.exception.ErrorUtil;
+import com.eactive.apim.portal.apps.commission.service.ExternalService;
+import com.eactive.apim.portal.common.util.SecurityUtil;
+import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections.MapUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+
+@Controller
+@RequestMapping(value = "/commission")
+@Secured("ROLE_APP")
+@RequiredArgsConstructor
+public class CommissionController {
+
+    private final Logger log = LoggerFactory.getLogger(CommissionController.class);
+
+    private final ExternalService externalService;
+    private final PortalPropertyService portalPropertyService;
+    private final ObjectMapper objectMapper = new ObjectMapper()
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+    @GetMapping("/manage")
+    public String commissionManagePage(Model model) {
+        // 기본 정보 설정
+        model.addAttribute("organization", SecurityUtil.getUserOrg());
+        model.addAttribute("noOrgCode", StringUtils.isEmpty(SecurityUtil.getUserOrg().getOrgCode()));
+        return "apps/commission/commissionManage";
+    }
+
+    @GetMapping("/print/{year}/{month}")
+    public String commissionPrintPage(
+        @PathVariable("year") String year,
+        @PathVariable("month") String month,
+        Model model) {
+
+        CommissionSearch search = new CommissionSearch();
+        search.setPartnerCode(SecurityUtil.getUserOrg().getOrgCode());
+        search.setYear(year);
+        search.setMonth(month);
+
+        CommissionResult result = fetchCommissionData(search, Constants.COMMISSION_PRINT_URL);
+
+        if (result.hasError()) {
+            model.addAttribute("error", result.getError());
+            return "apps/commission/commissionPrint";
+        }
+
+        // Model에 데이터 바인딩
+        model.addAttribute("commission", result.getData());
+        model.addAttribute("organization", SecurityUtil.getUserOrg().getOrgName());
+        model.addAttribute("year", year);
+        model.addAttribute("month", month);
+        model.addAttribute("toDay", java.time.LocalDate.now().toString());
+
+        return "apps/commission/commissionPrint";
+    }
+
+    // ==================== API Endpoints ====================
+
+    @PostMapping("/print/check")
+    public ResponseEntity<?> checkPrintData(@RequestBody CommissionSearch search) {
+        search.setPartnerCode(SecurityUtil.getUserOrg().getOrgCode());
+
+        if (StringUtils.isEmpty(search.getPartnerCode())) {
+            return ErrorUtil.create("fail.commission.needPartnerCode");
+        }
+
+        CommissionResult result = fetchCommissionData(search, Constants.COMMISSION_PRINT_URL);
+
+        if (result.hasError()) {
+            return ErrorUtil.create("fail.commission.print", result.getError());
+        }
+
+        return ResponseEntity.ok().body(result.getData());
+    }
+
+    @PostMapping()
+    public ResponseEntity<?> list(@RequestBody CommissionSearch search) {
+        search.setPartnerCode(SecurityUtil.getUserOrg().getOrgCode());
+
+        if (StringUtils.isEmpty(search.getPartnerCode())) {
+            return ErrorUtil.create("fail.commission.needPartnerCode");
+        }
+
+        CommissionResult result = fetchCommissionData(search, Constants.COMMISSION_URL);
+
+        if (result.hasError()) {
+            return ErrorUtil.create("fail.commission.list", result.getError());
+        }
+
+        return ResponseEntity.ok().body(result.getData());
+    }
+
+    // ==================== Private Methods ====================
+
+    /**
+     * 외부 API를 호출하여 수수료 데이터를 조회합니다.
+     *
+     * @param search 검색 조건
+     * @param apiPath API 경로 (Constants.COMMISSION_URL 또는 Constants.COMMISSION_PRINT_URL)
+     * @return 조회 결과
+     */
+    private CommissionResult fetchCommissionData(CommissionSearch search, String apiPath) {
+        if (StringUtils.isEmpty(search.getPartnerCode())) {
+            return CommissionResult.error("파트너 코드가 없습니다.");
+        }
+
+        try {
+            String obmUrl = portalPropertyService.getPortalPropertiesAsMap("Portal").getOrDefault("obp.obm.url", "");
+            String url = obmUrl + apiPath;
+
+            // 첫 번째 API 호출
+            String result = externalService.getResponseHttpPost(url, toJson(search));
+            if (StringUtils.isEmpty(result)) {
+                return CommissionResult.error("외부 서버 연결에 실패하였습니다.");
+            }
+
+            HashMap<String, Object> returnObj = objectMapper.readValue(result, HashMap.class);
+
+            // 에러 응답 체크
+            String errorMessage = extractErrorMessage(returnObj);
+            if (errorMessage != null) {
+                return CommissionResult.error(errorMessage);
+            }
+
+            // Together 관련 추가 처리 (000002-01)
+            if (StringUtils.pathEquals(search.getPartnerCode(), "000002-01")) {
+                log.debug("Found Together : " + search.getPartnerCode());
+
+                CommissionSearch togetherSearch = new CommissionSearch();
+                togetherSearch.setPartnerCode("000002-02");
+                togetherSearch.setYear(search.getYear());
+                togetherSearch.setMonth(search.getMonth());
+
+                String togetherResult = externalService.getResponseHttpPost(url, toJson(togetherSearch));
+                if (StringUtils.isEmpty(togetherResult)) {
+                    return CommissionResult.error("외부 서버 연결에 실패하였습니다.");
+                }
+
+                HashMap<String, Object> togetherReturnObj = objectMapper.readValue(togetherResult, HashMap.class);
+                log.debug("togetherLendingReturnObj : " + togetherReturnObj.toString());
+
+                String togetherErrorMessage = extractErrorMessage(togetherReturnObj);
+                if (togetherErrorMessage != null) {
+                    return CommissionResult.error(togetherErrorMessage);
+                }
+
+                HashMap<String, Object> mergeMap = mergeCommissionData(returnObj, togetherReturnObj);
+                result = objectMapper.writeValueAsString(mergeMap);
+            }
+
+            CommissionDTO commissionDTO = objectMapper.readValue(result, CommissionDTO.class);
+            return CommissionResult.success(commissionDTO);
+
+        } catch (Exception e) {
+            log.warn(e.getMessage(), e);
+            return CommissionResult.error("수수료 조회에 실패하였습니다.");
+        }
+    }
+
+    /**
+     * 응답에서 에러 메시지를 추출합니다.
+     */
+    private String extractErrorMessage(HashMap<String, Object> response) {
+        if (!StringUtils.isEmpty(response.get("error"))) {
+            HashMap<String, Object> error = (HashMap) response.get("error");
+            return error.get("message").toString();
+        }
+        return null;
+    }
+
+    private String toJson(CommissionSearch search) {
+        try {
+            Map<String, String> jsonMap = new HashMap<>();
+            jsonMap.put("partnerCode", search.getPartnerCode());
+            // 월을 두 자리로 패딩 (예: 1 -> 01, 12 -> 12)
+            String paddedMonth = String.format("%02d", Integer.parseInt(search.getMonth()));
+            jsonMap.put("targetOnMonth", search.getYear() + paddedMonth);
+
+            return objectMapper.writeValueAsString(jsonMap);
+        } catch (Exception e) {
+            log.warn("Failed to serialize CommissionSearch to JSON", e);
+            return "{}";
+        }
+    }
+
+    /**
+     * Safely parse double value from HashMap
+     * Handles both numeric types and string representations
+     */
+    private double safeGetDouble(HashMap<String, Object> map, String key) {
+        Object value = map.get(key);
+        if (value == null) {
+            return 0.0;
+        }
+        try {
+            if (value instanceof Number) {
+                return ((Number) value).doubleValue();
+            } else if (value instanceof String) {
+                return Double.parseDouble((String) value);
+            }
+            return 0.0;
+        } catch (NumberFormatException e) {
+            log.warn("Failed to parse double value for key: {} with value: {}", key, value);
+            return 0.0;
+        }
+    }
+
+    public HashMap<String, Object> mergeCommissionData(HashMap<String, Object> o1, HashMap<String, Object> o2) {
+
+        HashMap<String, Object> mergeMap = new HashMap<String, Object>();
+
+        String o1Status = MapUtils.getString(o1, "status");
+        String o2Status = MapUtils.getString(o2, "status");
+        String resultStatus = null;
+        if (Integer.parseInt(o1Status) <= Integer.parseInt(o2Status)) {
+            resultStatus = o1Status;
+        } else {
+            resultStatus = o2Status;
+        }
+        double apiTotalValueSum = safeGetDouble(o1, "apiTotalValueSum") + safeGetDouble(o2, "apiTotalValueSum");
+        double apiSum = safeGetDouble(o1, "apiSum") + safeGetDouble(o2, "apiSum");
+        double apiTotalValueSum2 = safeGetDouble(o1, "apiTotalValueSum2") + safeGetDouble(o2, "apiTotalValueSum2");
+        double apiSum2 = safeGetDouble(o1, "apiSum2") + safeGetDouble(o2, "apiSum2");
+        double productTotalValueCountSum = safeGetDouble(o1, "productTotalValueCountSum") + safeGetDouble(o2, "productTotalValueCountSum");
+        double productTotalValueAmountSum = safeGetDouble(o1, "productTotalValueAmountSum") + safeGetDouble(o2, "productTotalValueAmountSum");
+        double productSum = safeGetDouble(o1, "productSum") + safeGetDouble(o2, "productSum");
+        double productTotalValueCountSum2 = safeGetDouble(o1, "productTotalValueCountSum2") + safeGetDouble(o2, "productTotalValueCountSum2");
+        double productTotalValueAmountSum2 = safeGetDouble(o1, "productTotalValueAmountSum2") + safeGetDouble(o2, "productTotalValueAmountSum2");
+        double productSum2 = safeGetDouble(o1, "productSum2") + safeGetDouble(o2, "productSum2");
+        double totalValueCountSum = safeGetDouble(o1, "totalValueCountSum") + safeGetDouble(o2, "totalValueCountSum");
+        double totalValueCountSum2 = safeGetDouble(o1, "totalValueCountSum2") + safeGetDouble(o2, "totalValueCountSum2");
+        double totalValueAmountSum = safeGetDouble(o1, "totalValueAmountSum") + safeGetDouble(o2, "totalValueAmountSum");
+        double totalValueAmountSum2 = safeGetDouble(o1, "totalValueAmountSum2") + safeGetDouble(o2, "totalValueAmountSum2");
+        double sum = safeGetDouble(o1, "sum") + safeGetDouble(o2, "sum");
+        double sum2 = safeGetDouble(o1, "sum2") + safeGetDouble(o2, "sum2");
+
+        List<Map> o1List = (ArrayList) o1.get("list");
+        List<Map> o2pList = (ArrayList) o2.get("list");
+        o1List.addAll(o2pList);
+
+        mergeMap.put("status", resultStatus);
+        mergeMap.put("apiTotalValueSum", String.format("%.2f", apiTotalValueSum));
+        mergeMap.put("apiSum", String.format("%.2f", apiSum));
+        mergeMap.put("apiTotalValueSum2", String.format("%.2f", apiTotalValueSum2));
+        mergeMap.put("apiSum2", String.format("%.2f", apiSum2));
+        mergeMap.put("productTotalValueCountSum", String.format("%.2f", productTotalValueCountSum));
+        mergeMap.put("productTotalValueAmountSum", String.format("%.2f", productTotalValueAmountSum));
+        mergeMap.put("productSum", String.format("%.2f", productSum));
+        mergeMap.put("productTotalValueCountSum2", String.format("%.2f", productTotalValueCountSum2));
+        mergeMap.put("productTotalValueAmountSum2", String.format("%.2f", productTotalValueAmountSum2));
+        mergeMap.put("productSum2", String.format("%.2f", productSum2));
+        mergeMap.put("totalValueCountSum", String.format("%.2f", totalValueCountSum));
+        mergeMap.put("totalValueCountSum2", String.format("%.2f", totalValueCountSum2));
+        mergeMap.put("totalValueAmountSum", String.format("%.2f", totalValueAmountSum));
+        mergeMap.put("totalValueAmountSum2", String.format("%.2f", totalValueAmountSum2));
+        mergeMap.put("sum", String.format("%.2f", sum));
+        mergeMap.put("sum2", String.format("%.2f", sum2));
+        mergeMap.put("list", o1List);
+
+        return mergeMap;
+    }
+
+    // ==================== Inner Classes ====================
+
+    /**
+     * 수수료 조회 결과를 담는 내부 클래스
+     */
+    private static class CommissionResult {
+        private CommissionDTO data;
+        private String error;
+
+        static CommissionResult success(CommissionDTO data) {
+            CommissionResult result = new CommissionResult();
+            result.data = data;
+            return result;
+        }
+
+        static CommissionResult error(String message) {
+            CommissionResult result = new CommissionResult();
+            result.error = message;
+            return result;
+        }
+
+        boolean hasError() {
+            return error != null;
+        }
+
+        CommissionDTO getData() {
+            return data;
+        }
+
+        String getError() {
+            return error;
+        }
+    }
+}

src/main/java/com/eactive/apim/portal/apps/commission/dto/CommissionDTO.java

@@ -0,0 +1,28 @@
+package com.eactive.apim.portal.apps.commission.dto;
+
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class CommissionDTO {
+
+	private String status;
+    private String apiTotalValueSum;
+    private String apiSum;
+    private String apiTotalValueSum2;
+    private String apiSum2;
+    private String productTotalValueCountSum;
+    private String productTotalValueAmountSum;
+    private String productSum;
+    private String productTotalValueCountSum2;
+    private String productTotalValueAmountSum2;
+    private String productSum2;
+    private String totalValueCountSum;
+    private String totalValueCountSum2;
+    private String totalValueAmountSum;
+    private String totalValueAmountSum2;
+    private String sum;
+    private String sum2;
+    private List<CommissionList> list;
+    private String documentFormatNo;
+}

src/main/java/com/eactive/apim/portal/apps/commission/dto/CommissionList.java

@@ -0,0 +1,32 @@
+package com.eactive.apim.portal.apps.commission.dto;
+
+import lombok.Data;
+
+/**
+ * Created by jskim on 17. 01. 26.
+ *
+ * @author jskim
+ */
+@Data
+public class CommissionList {
+
+    private String paymentTargetName;
+    private String paymentTargetType;
+    private String value;
+    private String minimumAmount;
+    private String maximumAmount;
+	private String totalCount;
+    private String totalCount2;
+    private String totalValue;
+    private String totalValue2;
+    private String minimumAmount2;
+    private String maximumAmount2;
+    private String paymentBaseName;
+    private String paymentTimingName;
+    private String valueDivisionName;
+    private String sum;
+    private String sum2;
+    private String detailFeeTypeName;
+    private String value2;
+    private String changeReason2;
+}

src/main/java/com/eactive/apim/portal/apps/commission/dto/CommissionSearch.java

@@ -0,0 +1,17 @@
+package com.eactive.apim.portal.apps.commission.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CommissionSearch {
+
+	@ApiModelProperty(value = "대상년")
+    private String year;
+
+	@ApiModelProperty(value = "대상월")
+    private String month;
+
+    private String partnerCode;
+
+}

src/main/java/com/eactive/apim/portal/apps/commission/exception/ErrorUtil.java

@@ -0,0 +1,27 @@
+package com.eactive.apim.portal.apps.commission.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * Created by ybsong on 16. 12. 7.
+ *
+ * @author ybsong
+ */
+public class ErrorUtil {
+    public static ResponseEntity<ErrorVM> create(HttpStatus status, String message, String description) {
+        return new ResponseEntity<>(new ErrorVM(message, description), status);
+    }
+
+    public static ResponseEntity<ErrorVM> create(HttpStatus status, String message) {
+        return create(status, message, null);
+    }
+
+    public static ResponseEntity<ErrorVM> create(String message, String description) {
+        return create(HttpStatus.BAD_REQUEST, message, description);
+    }
+
+    public static ResponseEntity<ErrorVM> create(String message) {
+        return create(message, null);
+    }
+}

src/main/java/com/eactive/apim/portal/apps/commission/exception/ErrorVM.java

@@ -0,0 +1,43 @@
+package com.eactive.apim.portal.apps.commission.exception;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * View Model for transferring error message with a list of field errors.
+ */
+@Data
+public class ErrorVM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final String message;
+    private final String description;
+
+    private List<FieldErrorVM> fieldErrors;
+
+    public ErrorVM(String message) {
+        this(message, null);
+    }
+
+    public ErrorVM(String message, String description) {
+        this.message = message;
+        this.description = description;
+    }
+
+    public ErrorVM(String message, String description, List<FieldErrorVM> fieldErrors) {
+        this.message = message;
+        this.description = description;
+        this.fieldErrors = fieldErrors;
+    }
+
+    public void add(String objectName, String field, String message) {
+        if (fieldErrors == null) {
+            fieldErrors = new ArrayList<>();
+        }
+        fieldErrors.add(new FieldErrorVM(objectName, field, message));
+    }
+
+}

src/main/java/com/eactive/apim/portal/apps/commission/exception/FieldErrorVM.java

@@ -0,0 +1,33 @@
+package com.eactive.apim.portal.apps.commission.exception;
+
+import java.io.Serializable;
+
+public class FieldErrorVM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final String objectName;
+
+    private final String field;
+
+    private final String message;
+
+    public FieldErrorVM(String dto, String field, String message) {
+        this.objectName = dto;
+        this.field = field;
+        this.message = message;
+    }
+
+    public String getObjectName() {
+        return objectName;
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}

src/main/java/com/eactive/apim/portal/apps/commission/service/ExternalService.java

@@ -0,0 +1,80 @@
+package com.eactive.apim.portal.apps.commission.service;
+
+import com.eactive.apim.portal.apps.commission.constant.Constants;
+import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
+import java.util.Map;
+import javax.inject.Inject;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 외부 API 호출 서비스
+ * RestTemplate 기반으로 외부 시스템과 HTTP 통신을 수행합니다.
+ *
+ * @author ybsong
+ * @since 2017-03-02
+ */
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ExternalService {
+
+    private final Logger log = LoggerFactory.getLogger(ExternalService.class);
+
+    private final RestTemplate restTemplate;
+    private final PortalPropertyService portalPropertyService;
+
+    /**
+     * HTTP POST 요청을 통해 외부 API를 호출하고 응답을 받습니다.
+     *
+     * @param url 호출할 API URL
+     * @param payload 요청 본문 (JSON 문자열)
+     * @return API 응답 본문 (문자열), 오류 발생 시 null
+     */
+    public String getResponseHttpPost(String url, String payload) {
+        try {
+
+            Map<String, String>  portalProperties = portalPropertyService.getPortalPropertiesAsMap("Portal");
+
+            // HTTP 헤더 설정
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            headers.set(Constants.APIM_FOR_OBP_KEY, portalProperties.getOrDefault("obp.api_key","APIMPT-0002-QVBJTVBULTAwMDI="));
+            headers.set(Constants.APIM_CODE_FOR_OBP_KEY, portalProperties.getOrDefault("obp.partner_code","100001-01"));
+
+            // HTTP 요청 엔티티 생성 (헤더 + 본문)
+            HttpEntity<String> requestEntity = new HttpEntity<>(payload, headers);
+
+            // POST 요청 실행
+            ResponseEntity<String> response = restTemplate.postForEntity(url, requestEntity, String.class);
+
+            // 응답 본문 반환
+            return response.getBody();
+
+        } catch (HttpStatusCodeException e) {
+            // 4xx, 5xx 에러더라도 응답 본문이 있으면 반환 (에러 메시지 포함)
+            String responseBody = e.getResponseBodyAsString();
+            log.warn("HTTP error from external API: url={}, status={}, body={}", url, e.getStatusCode(), responseBody);
+            if (responseBody != null && !responseBody.isEmpty()) {
+                return responseBody;
+            }
+            return null;
+        } catch (RestClientException e) {
+            log.error("Failed to call external API: url={}, error={}", url, e.getMessage(), e);
+            return null;
+        } catch (Exception e) {
+            log.error("Unexpected error during HTTP POST: url={}", url, e);
+            return null;
+        }
+    }
+}

src/main/java/com/eactive/apim/portal/apps/community/faq/controller/FaqController.java

@@ -13,7 +13,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 public class FaqController {
@@ -48,16 +47,4 @@ public class FaqController {
 
         return "apps/community/mainFaqList";
     }
-
-    @GetMapping("/faq_view")
-    public String view(@RequestParam(value = "id", required = false) String id, Model model) {
-        if (id == null) {
-            return "redirect:/faq_list";
-        }
-
-        FaqDTO faq = faqFacade.getFaq(id);
-        model.addAttribute("faq", faq);
-
-        return "apps/community/mainFaqDetail";
-    }
 }

src/main/java/com/eactive/apim/portal/apps/community/faq/service/FaqFacade.java

@@ -7,6 +7,4 @@ import org.springframework.data.domain.Pageable;
 
 public interface FaqFacade {
     Page<FaqDTO> getFaqs(FaqSearch search, Pageable pageable);
-
-    FaqDTO getFaq(String id);
 }

src/main/java/com/eactive/apim/portal/apps/community/faq/service/FaqFacadeImpl.java

@@ -34,9 +34,4 @@ public class FaqFacadeImpl implements FaqFacade {
         return faqPage.map(faqMapper::map);
     }
 
-    @Override
-    public FaqDTO getFaq(String id) {
-        return faqMapper.map(faqService.findById(id));
-    }
-
 }

src/main/java/com/eactive/apim/portal/apps/community/partnership/controller/PartnershipApplicationController.java

@@ -40,7 +40,6 @@ public class PartnershipApplicationController {
 
         model.addAttribute("partnership", new PartnershipApplicationDTO());
         model.addAttribute("isInternalUser", UserTypeUtil.isCurrentUserInternal());
-        model.addAttribute("recentApplications", partnershipApplicationFacade.getMyRecentApplications());
         return "apps/community/mainPartnershipForm";
     }
 

src/main/java/com/eactive/apim/portal/apps/community/partnership/mapper/PartnershipApplicationMapper.java

@@ -2,10 +2,8 @@ package com.eactive.apim.portal.apps.community.partnership.mapper;
 
 
 import com.eactive.apim.portal.apps.community.partnership.dto.PartnershipApplicationDTO;
-import com.eactive.apim.portal.apps.community.partnership.dto.PartnershipApplicationSummaryDTO;
 import com.eactive.apim.portal.common.mapper.CommonMapper;
 import com.eactive.apim.portal.partnershipapplication.entity.PartnershipApplication;
-import java.util.List;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.springframework.stereotype.Component;
@@ -18,8 +16,4 @@ import org.springframework.stereotype.Component;
 public interface PartnershipApplicationMapper {
 
     PartnershipApplication toEntity(PartnershipApplicationDTO dto);
-
-    PartnershipApplicationSummaryDTO toSummaryDto(PartnershipApplication entity);
-
-    List<PartnershipApplicationSummaryDTO> toSummaryDtoList(List<PartnershipApplication> entities);
 }

src/main/java/com/eactive/apim/portal/apps/community/partnership/repository/PartnershipApplicationRepository.java

@@ -2,7 +2,6 @@ package com.eactive.apim.portal.apps.community.partnership.repository;
 
 import com.eactive.apim.portal.partnershipapplication.entity.PartnershipApplication;
 import com.eactive.eai.rms.data.EMSDataSource;
-import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -10,10 +9,4 @@ import org.springframework.stereotype.Repository;
 @Repository
 @EMSDataSource
 public interface PartnershipApplicationRepository extends JpaRepository<PartnershipApplication, String>, JpaSpecificationExecutor<PartnershipApplication> {
-
-    /**
-     * 특정 작성자(createdBy)가 등록한 최근 3건을 최신순으로 조회한다.
-     * createdBy 는 PersonalDataEncryptConverter 로 결정적 암호화되므로 평문 사용자 id 로 등가 조회가 가능하다.
-     */
-    List<PartnershipApplication> findTop3ByCreatedByOrderByCreatedDateDesc(String createdBy);
 }

src/main/java/com/eactive/apim/portal/apps/community/partnership/service/PartnershipApplicationFacade.java

@@ -1,16 +1,9 @@
 package com.eactive.apim.portal.apps.community.partnership.service;
 
 import com.eactive.apim.portal.apps.community.partnership.dto.PartnershipApplicationDTO;
-import com.eactive.apim.portal.apps.community.partnership.dto.PartnershipApplicationSummaryDTO;
 import java.io.IOException;
-import java.util.List;
 
 public interface PartnershipApplicationFacade {
 
     void createPartnershipApplication(PartnershipApplicationDTO partnershipApplicationDTO) throws IOException;
-
-    /**
-     * 현재 로그인 사용자가 작성한 최근 3건을 조회한다. 미인증이면 빈 목록.
-     */
-    List<PartnershipApplicationSummaryDTO> getMyRecentApplications();
 }

src/main/java/com/eactive/apim/portal/apps/community/partnership/service/PartnershipApplicationFacadeImpl.java

@@ -1,7 +1,6 @@
 package com.eactive.apim.portal.apps.community.partnership.service;
 
 import com.eactive.apim.portal.apps.community.partnership.dto.PartnershipApplicationDTO;
-import com.eactive.apim.portal.apps.community.partnership.dto.PartnershipApplicationSummaryDTO;
 import com.eactive.apim.portal.apps.community.partnership.mapper.PartnershipApplicationMapper;
 import com.eactive.apim.portal.common.user.PortalAuthenticatedUser;
 import com.eactive.apim.portal.common.util.SecurityUtil;
@@ -16,9 +15,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Service
@@ -63,14 +60,4 @@ public class PartnershipApplicationFacadeImpl implements PartnershipApplicationF
         }
         portalAdminNotifier.notifyPortalAdmins(MessageCode.PARTNERSHIP_CREATED, params);
     }
-
-    @Override
-    public List<PartnershipApplicationSummaryDTO> getMyRecentApplications() {
-        PortalAuthenticatedUser user = SecurityUtil.getPortalAuthenticatedUser();
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        List<PartnershipApplication> recent = partnershipApplicationService.findRecentByCreatedBy(user.getId());
-        return partnershipApplicationMapper.toSummaryDtoList(recent);
-    }
 }

src/main/java/com/eactive/apim/portal/apps/community/partnership/service/PartnershipApplicationService.java

@@ -2,7 +2,6 @@ package com.eactive.apim.portal.apps.community.partnership.service;
 
 import com.eactive.apim.portal.apps.community.partnership.repository.PartnershipApplicationRepository;
 import com.eactive.apim.portal.partnershipapplication.entity.PartnershipApplication;
-import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,12 +21,4 @@ public class PartnershipApplicationService {
     public void createPartnershipApplication(PartnershipApplication partnershipApplication) {
         partnershipApplicationRepository.save(partnershipApplication);
     }
-
-    /**
-     * 작성자 id 로 최근 등록 3건 조회(최신순).
-     */
-    @Transactional(readOnly = true)
-    public List<PartnershipApplication> findRecentByCreatedBy(String createdBy) {
-        return partnershipApplicationRepository.findTop3ByCreatedByOrderByCreatedDateDesc(createdBy);
-    }
 }

src/main/java/com/eactive/apim/portal/apps/community/qna/controller/InquiryController.java

@@ -7,7 +7,6 @@ import com.eactive.apim.portal.common.user.PortalAuthenticatedUser;
 import com.eactive.apim.portal.common.util.SecurityUtil;
 import com.eactive.apim.portal.common.util.UserTypeUtil;
 import com.eactive.apim.portal.djb.community.qna.comment.service.InquiryCommentFacade;
-import com.eactive.apim.portal.qna.entity.VisibilityScope;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -17,13 +16,11 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.validation.Valid;
@@ -59,7 +56,6 @@ public class InquiryController {
         model.addAttribute("inquiries", inquiries.getContent());
         model.addAttribute("page", inquiries);
         model.addAttribute("commentCounts", commentCounts);
-        model.addAttribute("visibilityCeiling", inquiryFacade.getVisibilityCeiling());
         return "apps/community/mainInquiryList";
     }
 
@@ -79,25 +75,13 @@ public class InquiryController {
         return "apps/community/mainInquiryDetail";
     }
 
-    /**
-     * 2-1. 조회수 증가 (sessionStorage dedup 통과 시 JS 가 POST 호출)
-     */
-    @PostMapping("/{id}/view")
-    public ResponseEntity<Void> increaseViewCount(@PathVariable String id) {
-        inquiryFacade.incrementViewCount(SecurityUtil.getPortalAuthenticatedUser(), id);
-        return ResponseEntity.ok().build();
-    }
-
     /**
      * 3. inquiry 등록 페이지
      */
     @GetMapping("/new")
     public String newInquiryForm(Model model) {
-        InquiryDTO inquiry = new InquiryDTO();
-        inquiry.setVisibility(VisibilityScope.ORG.name()); // 기본 공개범위: 법인공개
-        model.addAttribute("inquiry", inquiry);
+        model.addAttribute("inquiry", new InquiryDTO());
         model.addAttribute("isInternalUser", UserTypeUtil.isCurrentUserInternal());
-        addVisibilityOptions(model);
         return APPS_COMMUNITY_MAIN_INQUIRY_FORM;
     }
 
@@ -109,23 +93,14 @@ public class InquiryController {
         InquiryDTO inquiry = inquiryFacade.getMyInquiry(SecurityUtil.getPortalAuthenticatedUser(), id);
         model.addAttribute("inquiry", inquiry);
         model.addAttribute("isInternalUser", UserTypeUtil.isCurrentUserInternal());
-        addVisibilityOptions(model);
         return APPS_COMMUNITY_MAIN_INQUIRY_FORM;
     }
 
-    /** 공개범위 상한에 따른 폼 옵션 노출 플래그. PRIVATE 는 항상 허용. */
-    private void addVisibilityOptions(Model model) {
-        VisibilityScope ceiling = inquiryFacade.getVisibilityCeiling();
-        model.addAttribute("allowAll", ceiling.width() >= VisibilityScope.ALL.width());
-        model.addAttribute("allowOrg", ceiling.width() >= VisibilityScope.ORG.width());
-    }
-
     /**
      * 5. inquiry 등록 요청
      */
     @PostMapping
     public String createInquiry(@Valid @ModelAttribute InquiryDTO inquiryDTO, BindingResult bindingResult,
-                                @RequestParam(value = "image", required = false) MultipartFile image,
                                 RedirectAttributes redirectAttributes,
                                 Model model) throws IOException {
         if (bindingResult.hasErrors()) {
@@ -133,7 +108,7 @@ public class InquiryController {
             return APPS_COMMUNITY_MAIN_INQUIRY_FORM;
         }
 
-        inquiryFacade.createInquiry(inquiryDTO, image);
+        inquiryFacade.createInquiry(inquiryDTO);
 
         redirectAttributes.addFlashAttribute("success", "Q&A 작성이 완료되었습니다.");
         return REDIRECT_INQUIRY;
@@ -144,12 +119,11 @@ public class InquiryController {
      */
     @PostMapping("/edit")
     public String updateInquiry(@Valid @ModelAttribute InquiryDTO inquiryDTO, BindingResult bindingResult,
-                                @RequestParam(value = "image", required = false) MultipartFile image,
                                 RedirectAttributes redirectAttributes) throws IOException {
         if (bindingResult.hasErrors()) {
             return APPS_COMMUNITY_MAIN_INQUIRY_FORM;
         }
-        inquiryFacade.updateUserInquiry(SecurityUtil.getPortalAuthenticatedUser(), inquiryDTO.getId(), inquiryDTO, image);
+        inquiryFacade.updateUserInquiry(SecurityUtil.getPortalAuthenticatedUser(), inquiryDTO.getId(), inquiryDTO);
         redirectAttributes.addFlashAttribute("success", "Q&A 수정이 완료되었습니다.");
         return "redirect:/inquiry/detail?id=" + inquiryDTO.getId();
     }

src/main/java/com/eactive/apim/portal/apps/community/qna/dto/InquiryDTO.java

@@ -25,7 +25,7 @@ public class InquiryDTO {
     @Size(max = 4000, message = "제목은 50자를 초과할 수 없습니다.")
     private String inquiryDetail;
 
-    @Pattern(regexp = "^(PENDING|REVIEWING|RESPONDED|CLOSED)$", message = "유효하지 않은 문의 상태입니다.")
+    @Pattern(regexp = "^(PENDING|RESPONDED|CLOSED)$", message = "유효하지 않은 문의 상태입니다.")
     private String inquiryStatus;
 
     private String inquirerName;
@@ -51,22 +51,4 @@ public class InquiryDTO {
 
     private String maskedInquirerName;
 
-    /** 목록 작성자 표기용 법인명(이름과 별도 줄 표기). */
-    private String inquirerOrgName;
-
-    /** 상세 작성자 표기용 "이름 (법인명)". */
-    private String inquirerDisplay;
-
-    /** 공개범위(ALL/ORG/PRIVATE). 미지정 시 서버에서 상한으로 clamp. */
-    private String visibility;
-
-    /** 공개범위 표기용 한글 라벨(전체공개/법인공개/비공개). */
-    private String visibilityLabel;
-
-    /** 조회수(표시용). */
-    private long viewCount;
-
-    /** 목록에서 비공개 게시물을 "비공개 게시물"로 흐리게 표기할지 여부(비-소유자). */
-    private boolean privatePlaceholder;
-
 }

src/main/java/com/eactive/apim/portal/apps/community/qna/mapper/InquiryMapper.java

@@ -14,9 +14,6 @@ import org.springframework.stereotype.Component;
 @Component
 public interface InquiryMapper {
 
-    // visibility(공개범위)는 facade 에서 상한 clamp 후 수동 세팅, viewCount 는 서버가 관리
-    @Mapping(target = "visibility", ignore = true)
-    @Mapping(target = "viewCount", ignore = true)
     Inquiry toEntity(InquiryDTO inquiry);
 
     @Mapping(target = "inquirerName", source = "inquirer.userName")

src/main/java/com/eactive/apim/portal/apps/community/qna/service/InquiryFacade.java

@@ -3,30 +3,23 @@ package com.eactive.apim.portal.apps.community.qna.service;
 import com.eactive.apim.portal.apps.community.qna.dto.InquiryDTO;
 import com.eactive.apim.portal.apps.community.qna.dto.InquirySearch;
 import com.eactive.apim.portal.common.user.PortalAuthenticatedUser;
-import com.eactive.apim.portal.qna.entity.VisibilityScope;
 import java.io.IOException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.web.multipart.MultipartFile;
 
 public interface InquiryFacade {
 
     Page<InquiryDTO> getInquiries(InquirySearch search, Pageable pageable, PortalAuthenticatedUser user);
 
-    /** 문의 공개범위 상한(폼 옵션 노출 제어용). */
-    VisibilityScope getVisibilityCeiling();
-
     InquiryDTO getUserInquiry(PortalAuthenticatedUser user, String id);
 
     InquiryDTO getMyInquiry(PortalAuthenticatedUser user, String id);
 
     InquiryDTO getAccessibleInquiry(PortalAuthenticatedUser user, String id);
 
-    void createInquiry(InquiryDTO inquiryDTO, MultipartFile image) throws IOException;
+    void createInquiry(InquiryDTO inquiryDTO) throws IOException;
 
-    void updateUserInquiry(PortalAuthenticatedUser user, String id, InquiryDTO inquiryDTO, MultipartFile image) throws IOException;
-
-    void incrementViewCount(PortalAuthenticatedUser user, String id);
+    void updateUserInquiry(PortalAuthenticatedUser user, String id, InquiryDTO inquiryDTO) throws IOException;
 
     void deleteUserInquiry(PortalAuthenticatedUser user, String id);
 }

src/main/java/com/eactive/apim/portal/apps/community/qna/service/InquiryFacadeImpl.java

@@ -7,41 +7,26 @@ import com.eactive.apim.portal.common.user.PortalAuthenticatedUser;
 import com.eactive.apim.portal.common.util.SecurityUtil;
 import com.eactive.apim.portal.common.util.StringMaskingUtil;
 import com.eactive.apim.portal.djb.community.qna.comment.service.CommunityAdminNotifier;
-import com.eactive.apim.portal.file.entity.FileInfo;
-import com.eactive.apim.portal.file.exception.InvalidFileException;
-import com.eactive.apim.portal.file.service.FileService;
-import com.eactive.apim.portal.portalorg.entity.PortalOrg;
-import com.eactive.apim.portal.portaluser.entity.PortalUser;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums;
 import com.eactive.apim.portal.qna.entity.Inquiry;
-import com.eactive.apim.portal.qna.entity.VisibilityScope;
 import com.eactive.apim.portal.template.entity.MessageCode;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.io.FilenameUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 @Service
 @RequiredArgsConstructor
 public class InquiryFacadeImpl implements InquiryFacade {
 
-    private static final Set<String> IMAGE_EXTENSIONS =
-            new HashSet<>(Arrays.asList("jpg", "jpeg", "png", "gif"));
-
     private final InquiryService inquiryService;
     private final InquiryMapper inquiryMapper;
     private final CommunityAdminNotifier inquiryAdminNotifier;
-    private final FileService fileService;
 
     @Override
     public Page<InquiryDTO> getInquiries(InquirySearch search, Pageable pageable, PortalAuthenticatedUser user) {
@@ -55,8 +40,6 @@ public class InquiryFacadeImpl implements InquiryFacade {
 
         Page<Inquiry> inquiriesPage = inquiryService.getInquiries(spec, pageable);
 
-        VisibilityScope ceiling = inquiryService.getVisibilityCeiling();
-
         return inquiriesPage.map(inquiry -> {
             InquiryDTO dto = inquiryMapper.map(inquiry);
             if (dto != null && dto.getInquirer() != null) {
@@ -65,20 +48,8 @@ public class InquiryFacadeImpl implements InquiryFacade {
                         inquiry.getInquirer().getId(),
                         user.getId()
                 ));
-                PortalOrg org = inquiry.getInquirer().getPortalOrg();
-                if (org != null) {
-                    dto.setInquirerOrgName(org.getOrgName());
-                }
                 dto.getInquirer().setUserName(null); // 원본 데이터 제거
             }
-            // 비공개 게시물은 본인/같은 법인 관리자 외에는 "비공개 게시물"로만 노출
-            VisibilityScope effective = VisibilityScope.clampTo(inquiry.getVisibility(), ceiling);
-            dto.setVisibility(effective.name());
-            dto.setVisibilityLabel(effective.label());
-            if (effective == VisibilityScope.PRIVATE && !canReadPrivate(user, inquiry)) {
-                dto.setPrivatePlaceholder(true);
-                dto.setInquirySubject(null);
-            }
             return dto;
         });
     }
@@ -110,32 +81,14 @@ public class InquiryFacadeImpl implements InquiryFacade {
     @Override
     public InquiryDTO getAccessibleInquiry(PortalAuthenticatedUser user, String id) {
         Inquiry inquiry = inquiryService.getAccessibleInquiry(user, id);
-        InquiryDTO dto = inquiryMapper.map(inquiry);
-        if (dto != null) {
-            VisibilityScope effective = inquiryService.effectiveVisibility(inquiry);
-            dto.setVisibility(effective.name());
-            dto.setVisibilityLabel(effective.label());
-        }
-        if (dto != null && inquiry.getInquirer() != null) {
-            // 상세 작성자 표기: "이름 (법인명)" — 본인은 owner-bypass 로 원문
-            String maskedName = StringMaskingUtil.maskName(
-                    inquiry.getInquirer().getUserName(),
-                    inquiry.getInquirer().getId(),
-                    user.getId());
-            dto.setInquirerDisplay(withOrgName(maskedName, inquiry.getInquirer()));
-        }
-        return dto;
+        return inquiryMapper.map(inquiry);
     }
 
     @Override
-    public void createInquiry(InquiryDTO inquiryDTO, MultipartFile image) throws IOException {
+    public void createInquiry(InquiryDTO inquiryDTO) throws IOException {
         PortalAuthenticatedUser current = SecurityUtil.getPortalAuthenticatedUser();
         Inquiry inquiry = inquiryMapper.toEntity(inquiryDTO);
         inquiry.setInquirer(current);
-        inquiry.setVisibility(clampedVisibility(inquiryDTO.getVisibility()));
-        if (hasFile(image)) {
-            inquiry.setAttachFile(storeImage(null, image));
-        }
         inquiryService.createInquiry(inquiry);
 
         Map<String, Object> params = new HashMap<>();
@@ -146,91 +99,17 @@ public class InquiryFacadeImpl implements InquiryFacade {
     }
 
     @Override
-    public void updateUserInquiry(PortalAuthenticatedUser user, String id, InquiryDTO inquiryDTO, MultipartFile image) throws IOException {
+    public void updateUserInquiry(PortalAuthenticatedUser user, String id, InquiryDTO inquiryDTO) throws IOException {
         Inquiry existingInquiry = inquiryService.getMyInquiry(user, id);
+        inquiryDTO.setAttachFile(existingInquiry.getAttachFile());
 
         Inquiry inquiry = inquiryMapper.toEntity(inquiryDTO);
         inquiry.setInquirer(existingInquiry.getInquirer());
-        inquiry.setVisibility(clampedVisibility(inquiryDTO.getVisibility()));
-        // 이미지 교체 시 기존 fileId 로 업데이트, 없으면 기존 첨부 유지
-        if (hasFile(image)) {
-            inquiry.setAttachFile(storeImage(existingInquiry.getAttachFile(), image));
-        } else {
-            inquiry.setAttachFile(existingInquiry.getAttachFile());
-        }
         inquiryService.updateInquiry(id, inquiry);
     }
 
-    @Override
-    public void incrementViewCount(PortalAuthenticatedUser user, String id) {
-        // 접근 가능한 게시물만 조회수 증가
-        inquiryService.getAccessibleInquiry(user, id);
-        inquiryService.incrementViewCount(id);
-    }
-
-    @Override
-    public VisibilityScope getVisibilityCeiling() {
-        return inquiryService.getVisibilityCeiling();
-    }
-
     @Override
     public void deleteUserInquiry(PortalAuthenticatedUser user, String id) {
         inquiryService.deleteMyInquiry(user, id);
     }
-
-    // =====================================================================
-    // helpers
-    // =====================================================================
-
-    /** 요청 공개범위를 기본 ORG 로 두고 property 상한으로 clamp. */
-    private VisibilityScope clampedVisibility(String requested) {
-        VisibilityScope ceiling = inquiryService.getVisibilityCeiling();
-        VisibilityScope scope = VisibilityScope.fromString(requested, VisibilityScope.ORG);
-        return VisibilityScope.clampTo(scope, ceiling);
-    }
-
-    /** 비공개 게시물을 읽을 수 있는 사용자(작성자 본인 또는 같은 법인 관리자). */
-    private boolean canReadPrivate(PortalAuthenticatedUser user, Inquiry inquiry) {
-        PortalUser inquirer = inquiry.getInquirer();
-        if (inquirer == null || user == null) {
-            return false;
-        }
-        if (user.getId() != null && user.getId().equals(inquirer.getId())) {
-            return true;
-        }
-        return user.getRoleCode() == PortalUserEnums.RoleCode.ROLE_CORP_MANAGER
-                && isSameOrg(user, inquirer);
-    }
-
-    private boolean isSameOrg(PortalAuthenticatedUser user, PortalUser inquirer) {
-        PortalOrg userOrg = user.getPortalOrg();
-        PortalOrg inquirerOrg = inquirer.getPortalOrg();
-        return userOrg != null && inquirerOrg != null
-                && userOrg.getId() != null
-                && userOrg.getId().equals(inquirerOrg.getId());
-    }
-
-    /** "이름 (법인명)" 조합. 법인명이 없으면 이름만. */
-    private String withOrgName(String name, PortalUser inquirer) {
-        PortalOrg org = inquirer.getPortalOrg();
-        if (org != null && org.getOrgName() != null && !org.getOrgName().isEmpty()) {
-            return name + " (" + org.getOrgName() + ")";
-        }
-        return name;
-    }
-
-    private boolean hasFile(MultipartFile file) {
-        return file != null && !file.isEmpty();
-    }
-
-    /** 이미지 확장자 검증 후 단일 파일 저장, fileId 반환. */
-    private String storeImage(String existingFileId, MultipartFile image) throws IOException {
-        String ext = FilenameUtils.getExtension(image.getOriginalFilename());
-        if (ext == null || !IMAGE_EXTENSIONS.contains(ext.toLowerCase())) {
-            throw new InvalidFileException("이미지 파일(jpg, jpeg, png, gif)만 첨부할 수 있습니다.");
-        }
-        FileInfo fileInfo = fileService.createOrUpdateSingleFile(
-                existingFileId, image, image.getOriginalFilename(), true);
-        return fileInfo.getFileId();
-    }
 }

src/main/java/com/eactive/apim/portal/apps/community/qna/service/InquiryService.java

@@ -7,9 +7,7 @@ import com.eactive.apim.portal.common.user.PortalAuthenticatedUser;
 import com.eactive.apim.portal.portalorg.entity.PortalOrg;
 import com.eactive.apim.portal.portaluser.entity.PortalUser;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums;
-import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
 import com.eactive.apim.portal.qna.entity.Inquiry;
-import com.eactive.apim.portal.qna.entity.VisibilityScope;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
@@ -21,19 +19,10 @@ import org.springframework.transaction.annotation.Transactional;
 public class InquiryService {
 
     public static final String PENDING = "PENDING";
-
-    /** 문의 공개범위 상한/기본값 property. */
-    private static final String PROP_GROUP = "Portal";
-    private static final String PROP_VISIBILITY_CEILING = "djb.inquiry.default-visibility";
-    private static final String PROP_VISIBILITY_DESC = "Q&A 문의 공개범위 상한/기본값 (ALL/ORG/PRIVATE)";
-
     private final InquiryRepository inquiryRepository;
-    private final PortalPropertyService portalPropertyService;
 
-    public InquiryService(InquiryRepository inquiryRepository,
-                          PortalPropertyService portalPropertyService) {
+    public InquiryService(InquiryRepository inquiryRepository) {
         this.inquiryRepository = inquiryRepository;
-        this.portalPropertyService = portalPropertyService;
     }
 
     /**
@@ -86,7 +75,6 @@ public class InquiryService {
         inquiry.setInquirySubject(updatedInquiry.getInquirySubject());
         inquiry.setInquiryDetail(updatedInquiry.getInquiryDetail());
         inquiry.setAttachFile(updatedInquiry.getAttachFile());
-        inquiry.setVisibility(updatedInquiry.getVisibility());
         return inquiryRepository.save(inquiry);
     }
 
@@ -124,27 +112,12 @@ public class InquiryService {
         if (inquirer == null || user == null) {
             return false;
         }
-        // 작성자 본인은 공개범위와 무관하게 항상 접근 가능
         if (user.getId() != null && user.getId().equals(inquirer.getId())) {
             return true;
         }
-        VisibilityScope effective = effectiveVisibility(inquiry);
-        switch (effective) {
-            case ALL:
-                // 전체공개: 로그인 사용자면 접근 가능(@Secured 로 이미 인증됨)
-                return true;
-            case ORG:
-                return isSameOrg(user, inquirer);
-            case PRIVATE:
-                // 비공개: 본인 외에는 같은 법인 관리자만 열람
-                return isSameOrg(user, inquirer)
-                        && user.getRoleCode() == PortalUserEnums.RoleCode.ROLE_CORP_MANAGER;
-            default:
-                return false;
+        if (user.getRoleCode() == PortalUserEnums.RoleCode.ROLE_USER) {
+            return false;
         }
-    }
-
-    private boolean isSameOrg(PortalAuthenticatedUser user, PortalUser inquirer) {
         PortalOrg userOrg = user.getPortalOrg();
         PortalOrg inquirerOrg = inquirer.getPortalOrg();
         return userOrg != null && inquirerOrg != null
@@ -152,30 +125,4 @@ public class InquiryService {
                 && userOrg.getId().equals(inquirerOrg.getId());
     }
 
-    /**
-     * 게시물의 유효 공개범위 = 저장값을 property 상한으로 clamp 한 값.
-     * (property 가 항상 우선하므로 저장값이 옛 상한이라 넓더라도 재-clamp)
-     */
-    @Transactional(readOnly = true)
-    public VisibilityScope effectiveVisibility(Inquiry inquiry) {
-        return VisibilityScope.clampTo(inquiry.getVisibility(), getVisibilityCeiling());
-    }
-
-    /** PTL_PROPERTY 에 설정된 공개범위 상한(없으면 ORG). */
-    @Transactional(readOnly = true)
-    public VisibilityScope getVisibilityCeiling() {
-        String value = portalPropertyService.getOrCreateProperty(
-                PROP_GROUP, PROP_VISIBILITY_CEILING, VisibilityScope.ORG.name(), PROP_VISIBILITY_DESC);
-        return VisibilityScope.fromString(value, VisibilityScope.ORG);
-    }
-
-    /**
-     * 조회수 1 증가. sessionStorage dedup 을 통과한 POST 요청에서만 호출된다.
-     */
-    public void incrementViewCount(String id) {
-        Inquiry inquiry = getInquiry(id);
-        inquiry.increaseViewCount();
-        inquiryRepository.save(inquiry);
-    }
-
 }

src/main/java/com/eactive/apim/portal/apps/session/service/UserSessionService.java

@@ -23,10 +23,6 @@ public class UserSessionService {
     private static final String PROPERTY_NAME = "session.timeout.minutes";
     private static final String DEFAULT_TIMEOUT_MINUTES = "15";
 
-    /** 세션 유지(타임아웃 무시) 기능 활성화 여부 프로퍼티 (true/false). 비운영 전용 — prod 가드는 상위(GlobalControllerAdvice)에서 적용 */
-    private static final String KEEPALIVE_PROPERTY_NAME = "session.keepalive.enabled";
-    private static final String DEFAULT_KEEPALIVE_ENABLED = "false";
-
     /** 논리적 만료(lastAccessTime + 타임아웃) 이후 물리적 삭제까지 두는 안전 마진(분) */
     private static final long CLEANUP_MARGIN_MINUTES = 1;
 
@@ -137,20 +133,6 @@ public class UserSessionService {
         }
     }
 
-    /**
-     * DB(PortalProperty)에서 세션 유지(타임아웃 무시) 기능 활성화 여부 조회.
-     * ⚠️ prod 가드는 포함하지 않는다 — prod 차단은 호출부(GlobalControllerAdvice)에서 {@code !prod && isKeepAliveEnabled()}로 처리.
-     */
-    public boolean isKeepAliveEnabled() {
-        String value = portalPropertyService.getOrCreateProperty(
-                PROPERTY_GROUP,
-                KEEPALIVE_PROPERTY_NAME,
-                DEFAULT_KEEPALIVE_ENABLED,
-                "세션 유지(타임아웃 무시) 기능 활성화 여부 (true/false, 비운영 전용)"
-        );
-        return value != null && Boolean.parseBoolean(value.trim());
-    }
-
     /**
      * 세션의 잔여 시간(초) 계산. 세션 레코드가 없으면 0.
      */

src/main/java/com/eactive/apim/portal/common/breadcrumb/GlobalControllerAdvice.java

@@ -4,13 +4,11 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.Profiles;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
 import com.eactive.apim.portal.config.PortalProperties;
 import com.eactive.apim.portal.apps.session.service.UserSessionService;
-import com.eactive.apim.portal.common.security.ClientGuardService;
 
 @ControllerAdvice
 public class GlobalControllerAdvice {
@@ -18,18 +16,15 @@ public class GlobalControllerAdvice {
     @Autowired
     private PageService pageService;
 
+    @Autowired
+    private PortalPropertyService portalPropertyService;
+
     @Autowired
     private PortalProperties portalProperties;
 
     @Autowired
     private UserSessionService userSessionService;
 
-    @Autowired
-    private ClientGuardService clientGuardService;
-
-    @Autowired
-    private Environment environment;
-
     @ModelAttribute("breadcrumb")
     public List<Map> addBreadcrumbToModel(HttpServletRequest request) {
         String currentPath = request.getRequestURI();
@@ -42,6 +37,17 @@ public class GlobalControllerAdvice {
         return pageService.getPageName(currentPath);
     }
 
+    @ModelAttribute("designSurveyEnabled")
+    public boolean isDesignSurveyEnabled() {
+        String value = portalPropertyService.getOrCreateProperty(
+            "Portal",
+            "ui.design-survey",
+            "false",
+            "네비게이션 바 디자인 설문 활성화 여부 (true/false)"
+        );
+        return "true".equalsIgnoreCase(value);
+    }
+
     @ModelAttribute("showTestAuthNotice")
     public boolean showTestAuthNotice() {
         return portalProperties.isTestAuthNoticeEnabled();
@@ -64,33 +70,4 @@ public class GlobalControllerAdvice {
     public int sessionTimeoutMinutes() {
         return userSessionService.getSessionTimeoutMinutes();
     }
-
-    /**
-     * 세션 유지(타임아웃 무시) 기능 사용 가능 여부.
-     * 비운영(!prod) + DB property(Portal/session.keepalive.enabled=Y)일 때만 true.
-     * prod 환경에서는 property 값과 무관하게 항상 false → UI 체크박스 미렌더.
-     */
-    @ModelAttribute("sessionKeepAliveAllowed")
-    public boolean sessionKeepAliveAllowed() {
-        boolean prod = environment.acceptsProfiles(Profiles.of("prod"));
-        return !prod && userSessionService.isKeepAliveEnabled();
-    }
-
-    /**
-     * 클라이언트 가드 - 우클릭(contextmenu) 차단 활성화 여부.
-     * PortalProperty(Portal/djb.client-guard.contextmenu.enabled)에서 조회.
-     */
-    @ModelAttribute("clientGuardContextmenu")
-    public boolean clientGuardContextmenu() {
-        return clientGuardService.isContextmenuBlockEnabled();
-    }
-
-    /**
-     * 클라이언트 가드 - DevTools 감지 시 화면 삭제 활성화 여부.
-     * PortalProperty(Portal/djb.client-guard.devtools.enabled)에서 조회.
-     */
-    @ModelAttribute("clientGuardDevtools")
-    public boolean clientGuardDevtools() {
-        return clientGuardService.isDevtoolsGuardEnabled();
-    }
 }

src/main/java/com/eactive/apim/portal/common/security/ClientGuardService.java

@@ -1,42 +0,0 @@
-package com.eactive.apim.portal.common.security;
-
-import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * 클라이언트측 하드닝(우클릭 차단 · DevTools 감지) 토글을 DB(PortalProperty)에서 조회한다.
- *
- * <p>두 기능은 서로 독립된 property 로 on/off 한다. group 은 기존 {@code Portal} 을 재사용하여
- * {@link PortalPropertyService#getOrCreateProperty} 의 자동 생성이 동작하도록 한다.</p>
- *
- * <ul>
- *   <li>{@code djb.client-guard.contextmenu.enabled} - 우클릭(contextmenu) 차단</li>
- *   <li>{@code djb.client-guard.devtools.enabled} - DevTools 감지 시 화면 삭제</li>
- * </ul>
- */
-@Service
-@RequiredArgsConstructor
-public class ClientGuardService {
-
-    private static final String GROUP = "Portal";
-    private static final String NAME_CONTEXTMENU = "djb.client-guard.contextmenu.enabled";
-    private static final String NAME_DEVTOOLS = "djb.client-guard.devtools.enabled";
-
-    private final PortalPropertyService portalPropertyService;
-
-    /** 우클릭(contextmenu) 차단 활성화 여부 */
-    public boolean isContextmenuBlockEnabled() {
-        return read(NAME_CONTEXTMENU, "우클릭(contextmenu) 차단");
-    }
-
-    /** DevTools 감지 시 화면 삭제 활성화 여부 */
-    public boolean isDevtoolsGuardEnabled() {
-        return read(NAME_DEVTOOLS, "DevTools 감지 시 화면 삭제");
-    }
-
-    private boolean read(String name, String desc) {
-        return Boolean.parseBoolean(
-                portalPropertyService.getOrCreateProperty(GROUP, name, "false", desc).trim());
-    }
-}

src/main/java/com/eactive/apim/portal/config/PortalAuthenticationSuccessHandler.java

@@ -122,10 +122,6 @@ public class PortalAuthenticationSuccessHandler implements AuthenticationSuccess
         userSessionService.registerSession(sessionId, String.valueOf(user.getId()), normalizedUsername,
             clientIp, request.getHeader("User-Agent"));
 
-        // 물리 세션 타임아웃을 DB property(Portal/session.timeout.minutes)와 일치시킴.
-        // yml/weblogic.xml 기본값을 이 세션에 대해 override → 물리=논리 단일화(CSRF 수명 포함).
-        session.setMaxInactiveInterval(userSessionService.getSessionTimeoutMinutes() * 60);
-
         // 로그인 성공 시 세션 정보 로깅
         logLoginSuccess(request, session, username);
 

src/main/java/com/eactive/apim/portal/config/PortalPropertyDuplicateChecker.java

@@ -1,55 +0,0 @@
-package com.eactive.apim.portal.config;
-
-import com.eactive.apim.portal.portalproperty.repository.PortalPropertyRepository;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 기동 시 PTL_PROPERTY 무결성 점검.
- *
- * <p>PTL_PROPERTY 는 (PROPERTY_GROUP_NAME, PROPERTY_NAME) 조합이 유일해야 하지만, 운영 정책상
- * DB에 유니크 제약을 걸지 않는다. 대신 부팅 완료 시점에 중복 키를 스캔하여 존재하면 ERROR 로그로
- * 남긴다. (Spring Data 리포지토리는 인터페이스라 초기화 훅이 없어, 리포지토리를 사용하는 startup
- * 리스너로 점검한다.)</p>
- *
- * <p>중복은 {@code getOrCreateProperty} 최초 조회가 동시 요청으로 경합할 때 각각 INSERT되며 생길 수
- * 있다. 제약이 없으므로 중복 행은 자동 제거되지 않는다 — 로그를 보고 수동 정리해야 한다.</p>
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class PortalPropertyDuplicateChecker implements ApplicationListener<ApplicationReadyEvent> {
-
-    private final PortalPropertyRepository portalPropertyRepository;
-
-    @Override
-    @Transactional(readOnly = true)
-    public void onApplicationEvent(ApplicationReadyEvent event) {
-        List<Object[]> duplicates;
-        try {
-            duplicates = portalPropertyRepository.findDuplicatePropertyKeys();
-        } catch (Exception e) {
-            log.error("[PortalProperty 무결성] 중복 점검 쿼리 실패", e);
-            return;
-        }
-
-        if (duplicates == null || duplicates.isEmpty()) {
-            log.info("[PortalProperty 무결성] (PROPERTY_GROUP_NAME, PROPERTY_NAME) 중복 없음");
-            return;
-        }
-
-        // 1) (group, name) 은 유일해야 한다
-        // 2) 중복된 값 목록을 남긴다
-        log.error("[PortalProperty 무결성] (PROPERTY_GROUP_NAME, PROPERTY_NAME) 조합은 유일해야 합니다. "
-                + "DB 유니크 제약이 없어 중복 {}건이 방치되어 있습니다. 수동 정리 필요:", duplicates.size());
-        for (Object[] row : duplicates) {
-            log.error("  - PROPERTY_GROUP_NAME='{}', PROPERTY_NAME='{}', count={}", row[0], row[1], row[2]);
-        }
-    }
-}

src/main/java/com/eactive/apim/portal/config/StartupInfoPrinter.java

@@ -1,51 +0,0 @@
-package com.eactive.apim.portal.config;
-
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.boot.system.ApplicationPid;
-import org.springframework.context.ApplicationListener;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
-
-/**
- * Prints a startup banner to stdout once boot is complete.
- *
- * <p>Uses {@link System#out} directly (not a logger) so the info is shown even when
- * the logback console appender is disabled (CONSOLE_LOG_ENABLED=false).
- */
-@Component
-public class StartupInfoPrinter implements ApplicationListener<ApplicationReadyEvent> {
-
-    @Override
-    public void onApplicationEvent(ApplicationReadyEvent event) {
-        Environment env = event.getApplicationContext().getEnvironment();
-
-        String port = env.getProperty("server.port", "8080");
-        String contextPath = env.getProperty("server.servlet.context-path", "/");
-        if (!contextPath.startsWith("/")) {
-            contextPath = "/" + contextPath;
-        }
-        String url = "http://localhost:" + port + contextPath;
-
-        String[] active = env.getActiveProfiles();
-        String profile = active.length == 0
-                ? String.join(", ", env.getDefaultProfiles())
-                : String.join(", ", active);
-
-        String instanceName = env.getProperty("inst.Name", System.getProperty("inst.Name", "unknown"));
-        String pid = new ApplicationPid().toString();
-
-        StringBuilder sb = new StringBuilder();
-        sb.append(System.lineSeparator());
-        sb.append("=====================================================").append(System.lineSeparator());
-        sb.append("  EAPIM Portal - startup complete").append(System.lineSeparator());
-        sb.append("=====================================================").append(System.lineSeparator());
-        sb.append("  URL            : ").append(url).append(System.lineSeparator());
-        sb.append("  Spring profile : ").append(profile).append(System.lineSeparator());
-        sb.append("  Instance name  : ").append(instanceName).append(System.lineSeparator());
-        sb.append("  PID            : ").append(pid).append(System.lineSeparator());
-        sb.append("=====================================================").append(System.lineSeparator());
-
-        System.out.println(sb);
-        System.out.flush();
-    }
-}

src/main/java/com/eactive/apim/portal/djb/community/qna/comment/controller/InquiryCommentController.java

@@ -43,8 +43,7 @@ public class InquiryCommentController {
     public ResponseEntity<InquiryCommentDTO> create(@PathVariable String inquiryId,
                                                     @Valid @RequestBody InquiryCommentCreateRequest request) {
         PortalAuthenticatedUser current = SecurityUtil.getPortalAuthenticatedUser();
-        InquiryCommentDTO created = inquiryCommentFacade.createUserComment(
-                inquiryId, request.getContent(), request.getVisibility(), current);
+        InquiryCommentDTO created = inquiryCommentFacade.createUserComment(inquiryId, request.getContent(), current);
         return ResponseEntity.ok(created);
     }
 

src/main/java/com/eactive/apim/portal/djb/community/qna/comment/dto/InquiryCommentCreateRequest.java

@@ -11,7 +11,4 @@ public class InquiryCommentCreateRequest {
     @NotBlank(message = "댓글 내용을 입력해주세요.")
     @Size(max = 2000, message = "댓글은 2000자를 초과할 수 없습니다.")
     private String content;
-
-    /** 공개범위(ALL=공개, PRIVATE=비공개). 미지정 시 공개. */
-    private String visibility;
 }

src/main/java/com/eactive/apim/portal/djb/community/qna/comment/dto/InquiryCommentDTO.java

@@ -26,13 +26,4 @@ public class InquiryCommentDTO {
     private LocalDateTime createdDate;
 
     private boolean deletable;
-
-    /** 공개범위(ALL/PRIVATE). */
-    private String visibility;
-
-    /** 비공개 댓글 여부 — 허용 독자에게는 "비공개" 태그로 표시. */
-    private boolean privateComment;
-
-    /** 비공개 댓글이지만 열람 권한이 없어 "비공개 댓글"로만 노출되는지 여부. */
-    private boolean privatePlaceholder;
 }

src/main/java/com/eactive/apim/portal/djb/community/qna/comment/service/InquiryCommentFacade.java

@@ -11,7 +11,7 @@ public interface InquiryCommentFacade {
 
     List<InquiryCommentDTO> getComments(String inquiryId, PortalAuthenticatedUser current);
 
-    InquiryCommentDTO createUserComment(String inquiryId, String content, String visibility, PortalAuthenticatedUser current);
+    InquiryCommentDTO createUserComment(String inquiryId, String content, PortalAuthenticatedUser current);
 
     void deleteOwnComment(String commentId, PortalAuthenticatedUser current);
 

src/main/java/com/eactive/apim/portal/djb/community/qna/comment/service/InquiryCommentFacadeImpl.java

@@ -3,19 +3,15 @@ package com.eactive.apim.portal.djb.community.qna.comment.service;
 import com.eactive.apim.portal.apps.community.qna.service.InquiryService;
 import com.eactive.apim.portal.common.exception.NotFoundException;
 import com.eactive.apim.portal.common.user.PortalAuthenticatedUser;
-import com.eactive.apim.portal.common.util.StringMaskingUtil;
 import com.eactive.apim.portal.djb.community.qna.comment.dto.InquiryCommentDTO;
 import com.eactive.apim.portal.djb.community.qna.comment.repository.InquiryCommentRepository;
 import com.eactive.apim.portal.djb.community.qna.comment.repository.UserInfoRepository;
 import com.eactive.apim.portal.djb.community.qna.constant.DjbInquiryStatus;
 import com.eactive.apim.portal.djb.community.qna.support.InquiryCommentPermissionChecker;
-import com.eactive.apim.portal.portalorg.entity.PortalOrg;
 import com.eactive.apim.portal.portaluser.entity.PortalUser;
-import com.eactive.apim.portal.portaluser.entity.PortalUserEnums;
 import com.eactive.apim.portal.portaluser.repository.PortalUserRepository;
 import com.eactive.apim.portal.qna.entity.Inquiry;
 import com.eactive.apim.portal.qna.entity.InquiryComment;
-import com.eactive.apim.portal.qna.entity.VisibilityScope;
 import com.eactive.apim.portal.template.entity.MessageCode;
 import com.eactive.apim.portal.user.entity.UserInfo;
 import lombok.RequiredArgsConstructor;
@@ -41,7 +37,6 @@ public class InquiryCommentFacadeImpl implements InquiryCommentFacade {
 
     private static final String ADMIN_N = "N";
     private static final String DEL_N = "N";
-    private static final String UNKNOWN_WRITER = "(알 수 없음)";
 
     private final InquiryService inquiryService;
     private final InquiryCommentService commentService;
@@ -56,24 +51,21 @@ public class InquiryCommentFacadeImpl implements InquiryCommentFacade {
     public List<InquiryCommentDTO> getComments(String inquiryId, PortalAuthenticatedUser current) {
         inquiryService.getAccessibleInquiry(current, inquiryId);
         List<InquiryComment> comments = commentService.findActiveByInquiryId(inquiryId);
-        Map<String, Writer> writers = resolveWriters(comments);
+        Map<String, String> writerNames = resolveWriterNames(comments);
         return comments.stream()
-                .map(c -> toDto(c, current, writers))
+                .map(c -> toDto(c, current, writerNames))
                 .collect(Collectors.toList());
     }
 
     @Override
-    public InquiryCommentDTO createUserComment(String inquiryId, String content, String visibility, PortalAuthenticatedUser current) {
+    public InquiryCommentDTO createUserComment(String inquiryId, String content, PortalAuthenticatedUser current) {
         Inquiry inquiry = inquiryService.getAccessibleInquiry(current, inquiryId);
         permissionChecker.assertWritable(inquiry);
-        // 댓글은 공개(ALL)/비공개(PRIVATE) 2단계만 지원
-        VisibilityScope scope = VisibilityScope.PRIVATE == VisibilityScope.fromString(visibility, VisibilityScope.ALL)
-                ? VisibilityScope.PRIVATE : VisibilityScope.ALL;
-        InquiryComment saved = commentService.create(inquiry, content, ADMIN_N, scope);
+        InquiryComment saved = commentService.create(inquiry, content, ADMIN_N);
         publishAdminNotification(inquiry, saved, current);
-        Map<String, Writer> writers = new HashMap<>();
-        writers.put(current.getId(), currentWriter(current));
-        return toDto(saved, current, writers);
+        Map<String, String> writerNames = new HashMap<>();
+        writerNames.put(current.getId(), current.getUserName());
+        return toDto(saved, current, writerNames);
     }
 
     @Override
@@ -110,7 +102,7 @@ public class InquiryCommentFacadeImpl implements InquiryCommentFacade {
         adminNotifier.notifyPortalAdmins(MessageCode.INQUIRY_COMMENT_CREATED, params);
     }
 
-    private Map<String, Writer> resolveWriters(List<InquiryComment> comments) {
+    private Map<String, String> resolveWriterNames(List<InquiryComment> comments) {
         Set<String> ids = new HashSet<>();
         for (InquiryComment c : comments) {
             String createdBy = c.getCreatedBy();
@@ -118,11 +110,11 @@ public class InquiryCommentFacadeImpl implements InquiryCommentFacade {
                 ids.add(createdBy);
             }
         }
-        Map<String, Writer> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>();
         for (String id : ids) {
-            Writer writer = lookupWriter(id);
-            if (writer != null && writer.name != null && !writer.name.isEmpty()) {
-                map.put(id, writer);
+            String name = lookupWriterName(id);
+            if (name != null && !name.isEmpty()) {
+                map.put(id, name);
             } else {
                 log.warn("댓글 작성자명 조회 실패 — createdBy={}, isUuid={}", id, isUuid(id));
             }
@@ -130,35 +122,23 @@ public class InquiryCommentFacadeImpl implements InquiryCommentFacade {
         return map;
     }
 
-    private Writer lookupWriter(String createdBy) {
+    private String lookupWriterName(String createdBy) {
         if (isUuid(createdBy)) {
-            PortalUser portalUser = portalUserRepository.findById(createdBy).orElse(null);
-            if (portalUser != null && portalUser.getUserName() != null && !portalUser.getUserName().isEmpty()) {
-                return toWriter(portalUser);
+            String name = portalUserRepository.findById(createdBy)
+                    .map(PortalUser::getUserName).orElse(null);
+            if (name != null && !name.isEmpty()) {
+                return name;
             }
-            UserInfo userInfo = userInfoRepository.findById(createdBy).orElse(null);
-            return userInfo != null ? new Writer(userInfo.getUsername(), null, null) : null;
+            return userInfoRepository.findById(createdBy)
+                    .map(UserInfo::getUsername).orElse(null);
         }
-        UserInfo userInfo = userInfoRepository.findById(createdBy).orElse(null);
-        if (userInfo != null && userInfo.getUsername() != null && !userInfo.getUsername().isEmpty()) {
-            return new Writer(userInfo.getUsername(), null, null);
+        String name = userInfoRepository.findById(createdBy)
+                .map(UserInfo::getUsername).orElse(null);
+        if (name != null && !name.isEmpty()) {
+            return name;
         }
-        PortalUser portalUser = portalUserRepository.findById(createdBy).orElse(null);
-        return portalUser != null ? toWriter(portalUser) : null;
-    }
-
-    private Writer toWriter(PortalUser portalUser) {
-        PortalOrg org = portalUser.getPortalOrg();
-        return new Writer(portalUser.getUserName(),
-                org != null ? org.getId() : null,
-                org != null ? org.getOrgName() : null);
-    }
-
-    private Writer currentWriter(PortalAuthenticatedUser current) {
-        PortalOrg org = current.getPortalOrg();
-        return new Writer(current.getUserName(),
-                org != null ? org.getId() : null,
-                org != null ? org.getOrgName() : null);
+        return portalUserRepository.findById(createdBy)
+                .map(PortalUser::getUserName).orElse(null);
     }
 
     private boolean isUuid(String value) {
@@ -174,50 +154,15 @@ public class InquiryCommentFacadeImpl implements InquiryCommentFacade {
     }
 
     private InquiryCommentDTO toDto(InquiryComment entity, PortalAuthenticatedUser current,
-                                    Map<String, Writer> writers) {
+                                    Map<String, String> writerNames) {
         String writerId = entity.getCreatedBy();
-        boolean isAdmin = "Y".equals(entity.getAdminYn());
-        boolean isPrivate = entity.isPrivate();
-        boolean owner = writerId != null && writerId.equals(current.getId());
-        Writer writer = writerId != null ? writers.get(writerId) : null;
-
-        // 비공개 댓글 열람 권한: 관리자 댓글은 대상 아님, 작성자 본인 또는 같은 법인 관리자만
-        boolean canSee = owner || canSeePrivate(current, writer);
-        String scopeName = entity.getVisibility() != null ? entity.getVisibility().name() : VisibilityScope.ALL.name();
-
-        if (isPrivate && !canSee) {
-            // 열람 권한 없는 비공개 댓글 → "비공개 댓글"로만 노출, 작성자 신원 숨김
-            return InquiryCommentDTO.builder()
-                    .id(entity.getId())
-                    .content("비공개 댓글")
-                    .writerId(null)
-                    .writerName("비공개")
-                    .adminYn(entity.getAdminYn())
-                    .createdDate(entity.getCreatedDate())
-                    .deletable(false)
-                    .visibility(scopeName)
-                    .privateComment(true)
-                    .privatePlaceholder(true)
-                    .build();
-        }
-
-        boolean deletable = owner
+        boolean deletable = writerId != null
+                && writerId.equals(current.getId())
                 && entity.getInquiry() != null
                 && !DjbInquiryStatus.isClosed(entity.getInquiry().getInquiryStatus());
-
-        String writerName;
-        if (isAdmin) {
-            // 관리자 댓글은 실명 대신 "관리자"로만 표기 (신원 비노출)
-            writerName = "관리자";
-        } else {
-            String base = writer != null ? writer.name : null;
-            String masked = StringMaskingUtil.maskName(base, writerId, current.getId());
-            if (masked == null || masked.isEmpty()) {
-                masked = UNKNOWN_WRITER;
-            }
-            writerName = (writer != null && writer.orgName != null && !writer.orgName.isEmpty())
-                    ? masked + " (" + writer.orgName + ")"
-                    : masked;
+        String writerName = writerId != null ? writerNames.get(writerId) : null;
+        if (writerName == null || writerName.isEmpty()) {
+            writerName = "(알 수 없음)";
         }
         return InquiryCommentDTO.builder()
                 .id(entity.getId())
@@ -227,34 +172,6 @@ public class InquiryCommentFacadeImpl implements InquiryCommentFacade {
                 .adminYn(entity.getAdminYn())
                 .createdDate(entity.getCreatedDate())
                 .deletable(deletable)
-                .visibility(scopeName)
-                .privateComment(isPrivate)
-                .privatePlaceholder(false)
                 .build();
     }
-
-    /** 비공개 댓글을 볼 수 있는 같은 법인 관리자 여부. */
-    private boolean canSeePrivate(PortalAuthenticatedUser current, Writer writer) {
-        if (writer == null || writer.orgId == null) {
-            return false;
-        }
-        if (current.getRoleCode() != PortalUserEnums.RoleCode.ROLE_CORP_MANAGER) {
-            return false;
-        }
-        PortalOrg org = current.getPortalOrg();
-        return org != null && org.getId() != null && org.getId().equals(writer.orgId);
-    }
-
-    /** 댓글 작성자 정보(이름/법인). */
-    private static final class Writer {
-        private final String name;
-        private final String orgId;
-        private final String orgName;
-
-        private Writer(String name, String orgId, String orgName) {
-            this.name = name;
-            this.orgId = orgId;
-            this.orgName = orgName;
-        }
-    }
 }

src/main/java/com/eactive/apim/portal/djb/community/qna/comment/service/InquiryCommentService.java

@@ -4,7 +4,6 @@ import com.eactive.apim.portal.common.exception.NotFoundException;
 import com.eactive.apim.portal.djb.community.qna.comment.repository.InquiryCommentRepository;
 import com.eactive.apim.portal.qna.entity.Inquiry;
 import com.eactive.apim.portal.qna.entity.InquiryComment;
-import com.eactive.apim.portal.qna.entity.VisibilityScope;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,13 +25,12 @@ public class InquiryCommentService {
         return repository.findByInquiry_IdAndDelYnOrderByCreatedDateAsc(inquiryId, DEL_N);
     }
 
-    public InquiryComment create(Inquiry inquiry, String content, String adminYn, VisibilityScope visibility) {
+    public InquiryComment create(Inquiry inquiry, String content, String adminYn) {
         InquiryComment comment = new InquiryComment();
         comment.setInquiry(inquiry);
         comment.setCommentDetail(content);
         comment.setAdminYn(adminYn);
         comment.setDelYn(DEL_N);
-        comment.setVisibility(visibility != null ? visibility : VisibilityScope.ALL);
         return repository.save(comment);
     }
 

src/main/java/com/eactive/apim/portal/djb/community/qna/constant/DjbInquiryStatus.java

@@ -3,7 +3,6 @@ package com.eactive.apim.portal.djb.community.qna.constant;
 public final class DjbInquiryStatus {
 
     public static final String PENDING = "PENDING";
-    public static final String REVIEWING = "REVIEWING";
     public static final String RESPONDED = "RESPONDED";
     public static final String CLOSED = "CLOSED";
 
@@ -13,37 +12,4 @@ public final class DjbInquiryStatus {
     public static boolean isClosed(String status) {
         return CLOSED.equals(status);
     }
-
-    /**
-     * 상태 코드에 대응하는 사용자 노출용 한글명을 반환한다.
-     * (미매칭/null은 대기 상태로 간주)
-     */
-    public static String displayName(String status) {
-        if (RESPONDED.equals(status)) {
-            return "답변완료";
-        }
-        if (CLOSED.equals(status)) {
-            return "종료";
-        }
-        if (REVIEWING.equals(status)) {
-            return "검토중";
-        }
-        return "답변대기"; // PENDING 및 기본값
-    }
-
-    /**
-     * 상태 코드에 대응하는 배지 CSS modifier 클래스를 반환한다.
-     */
-    public static String badgeClass(String status) {
-        if (RESPONDED.equals(status)) {
-            return "inquiry-status-badge--completed";
-        }
-        if (CLOSED.equals(status)) {
-            return "inquiry-status-badge--closed";
-        }
-        if (REVIEWING.equals(status)) {
-            return "inquiry-status-badge--reviewing";
-        }
-        return "inquiry-status-badge--pending"; // PENDING 및 기본값
-    }
 }

src/main/java/com/eactive/apim/portal/djb/testbed/advice/DjbTestbedExceptionHandler.java

@@ -1,37 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.advice;
-
-import com.eactive.apim.portal.djb.testbed.controller.DjbTestbedAuthController;
-import com.eactive.apim.portal.djb.testbed.controller.DjbTestbedSpecController;
-import com.eactive.apim.portal.djb.testbed.exception.DjbUnsupportedAuthTypeException;
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-/**
- * 테스트베드 두 컨트롤러 한정 예외 → JSON 변환.
- * (qna 로컬 핸들러와 동일한 {@code {code, message}} 포맷.)
- */
-@RestControllerAdvice(assignableTypes = {DjbTestbedAuthController.class, DjbTestbedSpecController.class})
-public class DjbTestbedExceptionHandler {
-
-    @ExceptionHandler(DjbUnsupportedAuthTypeException.class)
-    public ResponseEntity<Map<String, Object>> handleUnsupportedAuthType(DjbUnsupportedAuthTypeException ex) {
-        Map<String, Object> body = new HashMap<>();
-        body.put("code", "UNSUPPORTED_AUTHTYPE");
-        body.put("message", ex.getMessage());
-        body.put("authtype", ex.getAuthtype());
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(body);
-    }
-
-    @ExceptionHandler(AccessDeniedException.class)
-    public ResponseEntity<Map<String, Object>> handleAccessDenied(AccessDeniedException ex) {
-        Map<String, Object> body = new HashMap<>();
-        body.put("code", "FORBIDDEN");
-        body.put("message", ex.getMessage());
-        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(body);
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/config/DjbTestbedGatewayProperty.java

@@ -1,157 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.config;
-
-import com.eactive.apim.portal.djb.testbed.enums.DjbGatewayMode;
-import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-/**
- * 테스트베드 게이트웨이 설정을 {@code PTL_PROPERTY}(그룹 {@code Portal}, key prefix {@code djb.gateway.})
- * 에서 읽는 얇은 접근자. 별도 property-injection 인프라 대신 기존
- * {@link PortalPropertyService#getOrCreateProperty} 를 직접 사용한다(사용자 지시).
- *
- * <p>{@code getOrCreateProperty} 는 DB row 미존재 시 default 로 INSERT(그룹 존재 시)하지만
- * <em>공백 값 보정은 하지 않으므로</em>, 여기 {@link #resolve} 에서 {@code isBlank → default} 폴백을 둔다.
- *
- * <p>비-Spring 컴포넌트인 {@code ApiTesterFilter}(@WebFilter)는
- * {@code ApplicationContextUtil.getContext().getBean(DjbTestbedGatewayProperty.class)} 로 접근한다.
- */
-@Component
-@RequiredArgsConstructor
-public class DjbTestbedGatewayProperty {
-
-    private final PortalPropertyService portalPropertyService;
-
-    private static final String GROUP = "Portal";
-
-    public static final String KEY_BASE_URL = "djb.gateway.base-url";
-    public static final String KEY_TOKEN_PATH = "djb.gateway.token-path";
-    public static final String KEY_API_KEY_HEADER = "djb.gateway.api-key-header";
-    public static final String KEY_OAUTH_HEADER = "djb.gateway.oauth-token-header";
-    public static final String KEY_TIMEOUT_SEC = "djb.gateway.timeout";
-    public static final String KEY_USE_PROXY = "djb.gateway.use-proxy";
-    public static final String KEY_TOKEN_USE_PROXY = "djb.gateway.token-use-proxy";
-
-    public static final String DEFAULT_BASE_URL = "PortalMock";
-    public static final String DEFAULT_TIMEOUT_SEC = "10";
-    public static final String DEFAULT_USE_PROXY = "true";
-    public static final String DEFAULT_TOKEN_USE_PROXY = "true";
-    private static final int TIMEOUT_FALLBACK_MS = 10_000;
-    /** GW 모드 실제 토큰 엔드포인트 경로 (DJERP_4000 OAuth 발급가이드 v0.2). */
-    public static final String DEFAULT_TOKEN_PATH = "/dj/oauth/token";
-    public static final String DEFAULT_API_KEY_HEADER = "X-DJB-API-Key";
-    /** 게이트웨이 API 호출 시 액세스 토큰 헤더명 (가이드 v0.2: Authorization → X-AUTH-TOKEN). */
-    public static final String DEFAULT_OAUTH_HEADER = "X-AUTH-TOKEN";
-
-    /** PortalMock 모드에서 사용하는 포털 기존 mock 토큰 경로. */
-    public static final String PORTAL_MOCK_TOKEN_PATH = "/api/v1/oauth/token";
-
-    public String baseUrl() {
-        return resolve(KEY_BASE_URL, DEFAULT_BASE_URL,
-                "GW Base URL. 문자열 \"PortalMock\" 이면 ApiTesterFilter 가 mock 토큰 반환");
-    }
-
-    public String tokenPath() {
-        return resolve(KEY_TOKEN_PATH, DEFAULT_TOKEN_PATH,
-                "OAuth 토큰 발급 경로 (GW 모드에서만 사용)");
-    }
-
-    public String apiKeyHeader() {
-        return resolve(KEY_API_KEY_HEADER, DEFAULT_API_KEY_HEADER,
-                "API Key 전달 헤더명");
-    }
-
-    public String oauthHeader() {
-        return resolve(KEY_OAUTH_HEADER, DEFAULT_OAUTH_HEADER,
-                "OAuth 액세스 토큰 전달 헤더명 (Bearer 토큰)");
-    }
-
-    /**
-     * 테스트베드 API 호출 시 서버 프록시({@code /api/call-api}) 사용 여부.
-     * {@code false} 이면 브라우저에서 대상 주소로 직접 호출(CORS 허용 필요). 기본 true.
-     */
-    public boolean useProxy() {
-        return parseBool(resolve(KEY_USE_PROXY, DEFAULT_USE_PROXY,
-                "테스트베드 API 호출 시 서버 프록시(/api/call-api) 사용 여부(true/false). false 이면 브라우저에서 직접 호출."), true);
-    }
-
-    /**
-     * 토큰 발급 시 서버 프록시({@code /api/call-api}) 사용 여부. API 호출 프록시와 별개로 설정.
-     * {@code false} 이면 브라우저에서 토큰 URL 로 직접 호출(CORS 허용 필요). 기본 true.
-     * (mock 모드는 포탈 자체 mock 토큰이라 프록시 유지가 자연스럽고, 실 GW 는 직접호출로 뺄 수 있음.)
-     */
-    public boolean tokenUseProxy() {
-        return parseBool(resolve(KEY_TOKEN_USE_PROXY, DEFAULT_TOKEN_USE_PROXY,
-                "테스트베드 토큰 발급 시 서버 프록시(/api/call-api) 사용 여부(true/false). false 이면 브라우저에서 직접 호출."), true);
-    }
-
-    /**
-     * 프로퍼티 값을 boolean 으로 해석. 레거시 {@code Y/N} 값도 자동 변환한다.
-     * {@code true}/{@code Y} → true, {@code false}/{@code N} → false, 그 외/null → {@code def}.
-     */
-    private static boolean parseBool(String v, boolean def) {
-        if (v == null) {
-            return def;
-        }
-        String s = v.trim();
-        if (s.equalsIgnoreCase("true") || s.equalsIgnoreCase("Y")) {
-            return true;
-        }
-        if (s.equalsIgnoreCase("false") || s.equalsIgnoreCase("N")) {
-            return false;
-        }
-        return def;
-    }
-
-    /** 테스트베드 프록시 연결/응답 타임아웃(ms). 미설정/파싱 실패 시 10초. (단위 저장: 초) */
-    public int timeoutMillis() {
-        try {
-            int sec = Integer.parseInt(resolve(KEY_TIMEOUT_SEC, DEFAULT_TIMEOUT_SEC,
-                    "테스트베드 프록시 연결/응답 타임아웃(초)"));
-            return sec > 0 ? sec * 1000 : TIMEOUT_FALLBACK_MS;
-        } catch (Exception e) {
-            return TIMEOUT_FALLBACK_MS;
-        }
-    }
-
-    public DjbGatewayMode resolveGatewayMode() {
-        return DEFAULT_BASE_URL.equalsIgnoreCase(baseUrl()) ? DjbGatewayMode.PORTAL_MOCK : DjbGatewayMode.GATEWAY;
-    }
-
-    /**
-     * OAuth 토큰 발급 URL.
-     * PortalMock → {@code portalOrigin + /api/v1/oauth/token} (기존 mock 필터가 가로챔),
-     * GATEWAY → {@code baseUrl + tokenPath}.
-     */
-    public String resolveTokenUrl(String portalOrigin) {
-        if (resolveGatewayMode() == DjbGatewayMode.PORTAL_MOCK) {
-            return stripTrailingSlash(portalOrigin) + PORTAL_MOCK_TOKEN_PATH;
-        }
-        return stripTrailingSlash(baseUrl()) + tokenPath();
-    }
-
-    /**
-     * GW 응답유형(spec responseType=gw)에서 사용할 API 호출 base URL.
-     * PortalMock → 요청 포탈 origin(mock 필터가 프록시), GATEWAY → {@code baseUrl}.
-     * (별도 {@code swagger.gw.address} 프로퍼티를 두지 않고 이 값을 단일 기준으로 사용한다.)
-     */
-    public String resolveApiBaseUrl(String portalOrigin) {
-        if (resolveGatewayMode() == DjbGatewayMode.PORTAL_MOCK) {
-            return stripTrailingSlash(portalOrigin);
-        }
-        return stripTrailingSlash(baseUrl());
-    }
-
-    private String resolve(String key, String defaultValue, String description) {
-        String value = portalPropertyService.getOrCreateProperty(GROUP, key, defaultValue, description);
-        return StringUtils.hasText(value) ? value.trim() : defaultValue;
-    }
-
-    private static String stripTrailingSlash(String s) {
-        if (s == null) {
-            return "";
-        }
-        return s.endsWith("/") ? s.substring(0, s.length() - 1) : s;
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/controller/DjbTestbedAuthController.java

@@ -1,51 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.controller;
-
-import com.eactive.apim.portal.djb.testbed.dto.DjbCredentialSecretDto;
-import com.eactive.apim.portal.djb.testbed.dto.DjbTestbedContextDto;
-import com.eactive.apim.portal.djb.testbed.service.DjbTestbedAuthService;
-import javax.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 테스트베드 인증 컨텍스트/시크릿 REST.
- * 컨트롤러 진입은 인증 없이 허용하되(비대상자도 context 를 받아야 함),
- * 실제 인증/역할/소유권 검증은 {@link DjbTestbedAuthService} 가 수행한다.
- */
-@RestController
-@RequestMapping("/djb/testbed/auth")
-@RequiredArgsConstructor
-public class DjbTestbedAuthController {
-
-    private final DjbTestbedAuthService authService;
-
-    @GetMapping("/context")
-    public ResponseEntity<DjbTestbedContextDto> context(HttpServletRequest request) {
-        return ResponseEntity.ok(authService.buildContext(resolveOrigin(request)));
-    }
-
-    @GetMapping("/credentials/{clientId}/secret")
-    public ResponseEntity<DjbCredentialSecretDto> credentialSecret(@PathVariable String clientId,
-                                                                   @RequestParam String apiId) {
-        DjbCredentialSecretDto secret = authService.getCredentialSecret(clientId, apiId);
-        return ResponseEntity.ok()
-                .header(HttpHeaders.CACHE_CONTROL, "no-store")
-                .header(HttpHeaders.PRAGMA, "no-cache")
-                .body(secret);
-    }
-
-    /** scheme://host[:port] (기본 포트는 생략). PortalMock 토큰 URL 구성에 사용. */
-    private String resolveOrigin(HttpServletRequest request) {
-        String scheme = request.getScheme();
-        String host = request.getServerName();
-        int port = request.getServerPort();
-        boolean defaultPort = ("http".equals(scheme) && port == 80) || ("https".equals(scheme) && port == 443);
-        return scheme + "://" + host + (defaultPort ? "" : ":" + port);
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/controller/DjbTestbedSpecController.java

@@ -1,75 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.controller;
-
-import com.eactive.apim.portal.apispec.entity.ApiSpecInfo;
-import com.eactive.apim.portal.apispec.service.ApiSpecInfoService;
-import com.eactive.apim.portal.djb.testbed.enums.DjbAuthType;
-import com.eactive.apim.portal.djb.testbed.service.DjbSwaggerSpecEnricher;
-import com.eactive.apim.portal.djb.testbed.service.DjbTestbedAuthService;
-import com.eactive.apim.portal.djb.testbed.service.DjbTestbedSpecServerRewriter;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * testbed spec(swagger.json/yaml)에 AUTHTYPE 기반 securityScheme 를 주입하고,
- * 서버 sentinel({@link DjbTestbedSpecServerRewriter#SERVER_SENTINEL})을 API SPEC 설정(responseType)에
- * 따른 실주소로 치환해 반환한다.
- * {@code default-token-api-spec} 은 클래스패스 기본 spec 을 그대로 반환(auth enrich 대상 외).
- */
-@RestController
-@RequestMapping("/djb/testbed/apis")
-@RequiredArgsConstructor
-@Slf4j
-public class DjbTestbedSpecController {
-
-    private final ApiSpecInfoService apiSpecInfoService;
-    private final DjbTestbedAuthService authService;
-    private final DjbSwaggerSpecEnricher enricher;
-    private final DjbTestbedSpecServerRewriter serverRewriter;
-
-    private static final String DEFAULT_TOKEN_API_ID = "default-token-api-spec";
-    private static final String DEFAULT_SPEC_PATH = "swagger/default-token-api-spec.json";
-
-    @GetMapping(value = "/{id}/swagger.json", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> swaggerWithAuth(@PathVariable String id, HttpServletRequest request) throws IOException {
-        String json = buildSpecJson(id, request);
-        return json == null ? ResponseEntity.notFound().build() : ResponseEntity.ok(json);
-    }
-
-    @GetMapping(value = "/{id}/swagger.yaml", produces = "application/x-yaml")
-    public ResponseEntity<String> swaggerYamlWithAuth(@PathVariable String id, HttpServletRequest request) throws IOException {
-        String json = buildSpecJson(id, request);
-        return json == null ? ResponseEntity.notFound().build() : ResponseEntity.ok(serverRewriter.toYaml(json));
-    }
-
-    /** default 토큰 spec 또는 저장 spec(auth enrich + 서버 sentinel 치환)을 JSON 으로 반환. 없으면 null. */
-    private String buildSpecJson(String id, HttpServletRequest request) throws IOException {
-        if (DEFAULT_TOKEN_API_ID.equals(id)) {
-            Resource resource = new ClassPathResource(DEFAULT_SPEC_PATH);
-            String content = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()), StandardCharsets.UTF_8);
-            return serverRewriter.rewriteServer(content, null, request);
-        }
-
-        Optional<ApiSpecInfo> spec = apiSpecInfoService.findById(id);
-        if (!spec.isPresent() || !StringUtils.hasText(spec.get().getTestbedSpec())) {
-            return null;
-        }
-
-        DjbAuthType authType = authService.resolveAuthType(id);
-        String enriched = enricher.enrich(spec.get().getTestbedSpec(), authType);
-        return serverRewriter.rewriteServer(enriched, spec.get(), request);
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/dto/DjbCredentialOptionDto.java

@@ -1,21 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.dto;
-
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * 테스트베드 앱 셀렉트에 노출할 앱(PTL_CREDENTIAL) 1건. 시크릿은 포함하지 않는다.
- */
-@Data
-@Builder
-public class DjbCredentialOptionDto {
-
-    /** PTL_CREDENTIAL.clientid */
-    private String clientId;
-
-    /** 사용자에게 보여줄 앱명(PTL_CREDENTIAL.clientname) */
-    private String clientName;
-
-    /** "0": 차단, "1": 정상 */
-    private String appStatus;
-}

src/main/java/com/eactive/apim/portal/djb/testbed/dto/DjbCredentialSecretDto.java

@@ -1,20 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.dto;
-
-import com.eactive.apim.portal.djb.testbed.enums.DjbAuthType;
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * 선택한 앱의 시크릿 단건 응답(캐시 금지 · 로그 마스킹 대상).
- * OAUTH 시 {@code clientSecret} 은 client_secret, API_KEY 시 API Key 값이다.
- */
-@Data
-@Builder
-public class DjbCredentialSecretDto {
-
-    private String clientId;
-
-    private String clientSecret;
-
-    private DjbAuthType authType;
-}

src/main/java/com/eactive/apim/portal/djb/testbed/dto/DjbTestbedContextDto.java

@@ -1,36 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.dto;
-
-import com.eactive.apim.portal.djb.testbed.enums.DjbGatewayMode;
-import java.util.List;
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * {@code GET /djb/testbed/auth/context} 응답. 시크릿은 포함하지 않는다.
- */
-@Data
-@Builder
-public class DjbTestbedContextDto {
-
-    /** 인증 정보 제공 대상자 여부 */
-    private boolean eligible;
-
-    /** 비대상 사유 코드: ANONYMOUS / INDIVIDUAL_USER / NO_CREDENTIAL (대상자면 null) */
-    private String reason;
-
-    /** 사용자가 선택할 수 있는 앱 목록 */
-    private List<DjbCredentialOptionDto> credentials;
-
-    /** 게이트웨이 정보(시크릿 제외) */
-    private GatewayInfo gateway;
-
-    @Data
-    @Builder
-    public static class GatewayInfo {
-        private DjbGatewayMode mode;
-        private String baseUrl;
-        private String tokenUrl;
-        private String apiKeyHeader;
-        private String oauthTokenHeader;
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/enums/DjbAuthType.java

@@ -1,42 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.enums;
-
-import com.eactive.apim.portal.djb.testbed.exception.DjbUnsupportedAuthTypeException;
-
-/**
- * 테스트베드가 지원하는 인증 체계. {@code TSEAIHE01.AUTHTYPE}(소문자 저장) 값을 매핑한다.
- * <ul>
- *   <li>{@code oauth}/{@code oauth2}/{@code ca} → {@link #OAUTH}</li>
- *   <li>{@code api_key}/{@code apikey} → {@link #API_KEY}</li>
- *   <li>{@code none}/{@code no}/{@code noauth} → {@link #NONE}(인증 없이 호출 — 앱 선택 불필요)</li>
- *   <li>{@code null}(EAIMessage 미존재) 및 그 외 → {@link DjbUnsupportedAuthTypeException}</li>
- * </ul>
- * ({@code ca} 는 게이트웨이 레거시 매퍼 {@code ObpApiService.mapAuthType} 이 OAUTH2 로 취급하는 값.)
- */
-public enum DjbAuthType {
-    OAUTH,
-    API_KEY,
-    NONE;
-
-    public static DjbAuthType fromAuthtype(String authtype) {
-        // null(EAIMessage 미존재)은 데이터 문제 → 종전대로 예외. "none" 은 인증 없는 API.
-        if (authtype == null) {
-            throw new DjbUnsupportedAuthTypeException("null");
-        }
-        String normalized = authtype.trim().toLowerCase();
-        switch (normalized) {
-            case "oauth":
-            case "oauth2":
-            case "ca":
-                return OAUTH;
-            case "api_key":
-            case "apikey":
-                return API_KEY;
-            case "none":
-            case "no":
-            case "noauth":
-                return NONE;
-            default:
-                throw new DjbUnsupportedAuthTypeException(authtype);
-        }
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/enums/DjbGatewayMode.java

@@ -1,14 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.enums;
-
-/**
- * 테스트베드 호출이 향하는 대상 모드.
- * <ul>
- *   <li>{@code PORTAL_MOCK} — {@code djb.gateway.base-url} 이 문자열 "PortalMock" 인 경우.
- *       {@code ApiTesterFilter} 가 mock 토큰/샘플 응답을 반환한다.</li>
- *   <li>{@code GATEWAY} — 그 외(실제 게이트웨이 URL). 토큰 발급 요청을 실 게이트웨이로 forward.</li>
- * </ul>
- */
-public enum DjbGatewayMode {
-    PORTAL_MOCK,
-    GATEWAY
-}

src/main/java/com/eactive/apim/portal/djb/testbed/exception/DjbUnsupportedAuthTypeException.java

@@ -1,20 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.exception;
-
-/**
- * TSEAIHE01.AUTHTYPE 값이 테스트베드가 지원하는 인증 체계(oauth/api_key)로
- * 매핑되지 않을 때 발생. {@link com.eactive.apim.portal.djb.testbed.advice.DjbTestbedExceptionHandler}
- * 에서 400 응답으로 변환된다.
- */
-public class DjbUnsupportedAuthTypeException extends RuntimeException {
-
-    private final String authtype;
-
-    public DjbUnsupportedAuthTypeException(String authtype) {
-        super("지원하지 않는 인증 체계: " + authtype);
-        this.authtype = authtype;
-    }
-
-    public String getAuthtype() {
-        return authtype;
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/service/DjbSwaggerSpecEnricher.java

@@ -1,106 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.service;
-
-import com.eactive.apim.portal.djb.testbed.config.DjbTestbedGatewayProperty;
-import com.eactive.apim.portal.djb.testbed.enums.DjbAuthType;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * testbed spec(JSON)에 인증 체계를 주입한다.
- *
- * <p>현재 데이터는 <b>OpenAPI 3.0</b>(auto-gen {@code "openapi":"3.0.0"})이므로
- * {@code components.securitySchemes} + 글로벌 {@code security} 에 주입한다.
- * (원본이 Swagger 2.0 이면 {@code securityDefinitions} 로 폴백.)
- *
- * <p>게이트웨이가 OAuth 액세스 토큰을 표준 {@code Authorization} 이 아니라 커스텀 헤더
- * {@code X-AUTH-TOKEN: Bearer ...} 로 받으므로(DJERP_4000 v0.2), OAuth 도 API_KEY 와 동일하게
- * <b>apiKey-in-header</b> 스킴으로 모델링한다(헤더명만 상이). 토큰 발급은 템플릿 JS가
- * {@code /api/call-api} 경유로 수행해 값을 {@code "Bearer <token>"} 으로 authorize 한다.
- *
- * <p>원본의 {@code paths}, {@code x-*} 확장, 기타 {@code components} 는 트리 조작으로 보존한다
- * (문자열 치환 금지).
- */
-@Service
-@RequiredArgsConstructor
-public class DjbSwaggerSpecEnricher {
-
-    private final ObjectMapper objectMapper;
-    private final DjbTestbedGatewayProperty gatewayProperty;
-
-    public static final String OAUTH_SCHEME = "djbOAuth";
-    public static final String API_KEY_SCHEME = "djbApiKey";
-
-    public String enrich(String specJson, DjbAuthType authType) throws JsonProcessingException {
-        JsonNode parsed = objectMapper.readTree(specJson);
-        if (!parsed.isObject()) {
-            // 예상 밖 형태면 원본 유지(멱등)
-            return specJson;
-        }
-        ObjectNode root = (ObjectNode) parsed;
-
-        // NONE: 인증 없이 호출 — 글로벌 security / securityScheme 흔적을 제거해
-        // Swagger UI 의 'Authorize' 버튼이 뜨지 않게 한다. (저장 spec 에 빈 securitySchemes 가
-        // 남아 있으면 UI 가 빈 인증 모달 버튼을 렌더하므로 정리한다.)
-        if (authType == DjbAuthType.NONE) {
-            return stripSecurity(root);
-        }
-
-        String schemeName = (authType == DjbAuthType.OAUTH) ? OAUTH_SCHEME : API_KEY_SCHEME;
-        ObjectNode scheme = buildApiKeyScheme(authType);
-
-        boolean swagger2 = root.has("swagger") && !root.has("openapi");
-        if (swagger2) {
-            getOrCreateObject(root, "securityDefinitions").set(schemeName, scheme);
-        } else {
-            ObjectNode components = getOrCreateObject(root, "components");
-            getOrCreateObject(components, "securitySchemes").set(schemeName, scheme);
-        }
-
-        // 글로벌 security 요구사항 (apiKey 스킴은 빈 스코프 배열)
-        ArrayNode security = objectMapper.createArrayNode();
-        ObjectNode requirement = objectMapper.createObjectNode();
-        requirement.set(schemeName, objectMapper.createArrayNode());
-        security.add(requirement);
-        root.set("security", security);
-
-        return objectMapper.writeValueAsString(root);
-    }
-
-    /** {@code { "type":"apiKey", "in":"header", "name":"<header>" }} — 2.0/3.0 동일 형태. */
-    private ObjectNode buildApiKeyScheme(DjbAuthType authType) {
-        String headerName = (authType == DjbAuthType.OAUTH)
-                ? gatewayProperty.oauthHeader()
-                : gatewayProperty.apiKeyHeader();
-        ObjectNode scheme = objectMapper.createObjectNode();
-        scheme.put("type", "apiKey");
-        scheme.put("in", "header");
-        scheme.put("name", headerName);
-        return scheme;
-    }
-
-    /** NONE 용: 글로벌 {@code security} / {@code components.securitySchemes} / {@code securityDefinitions} 제거. */
-    private String stripSecurity(ObjectNode root) throws JsonProcessingException {
-        root.remove("security");
-        root.remove("securityDefinitions"); // swagger 2.0
-        JsonNode components = root.get("components");
-        if (components != null && components.isObject()) {
-            ((ObjectNode) components).remove("securitySchemes");
-        }
-        return objectMapper.writeValueAsString(root);
-    }
-
-    private ObjectNode getOrCreateObject(ObjectNode parent, String field) {
-        JsonNode node = parent.get(field);
-        if (node != null && node.isObject()) {
-            return (ObjectNode) node;
-        }
-        ObjectNode created = objectMapper.createObjectNode();
-        parent.set(field, created);
-        return created;
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/service/DjbTestbedAuthService.java

@@ -1,133 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.service;
-
-import com.eactive.apim.gateway.data.eaimessage.EAIMessageRepository;
-import com.eactive.apim.portal.app.entity.Credential;
-import com.eactive.apim.portal.app.repository.CredentialRepository;
-import com.eactive.apim.portal.common.user.PortalAuthenticatedUser;
-import com.eactive.apim.portal.common.util.SecurityUtil;
-import com.eactive.apim.portal.djb.testbed.config.DjbTestbedGatewayProperty;
-import com.eactive.apim.portal.djb.testbed.dto.DjbCredentialOptionDto;
-import com.eactive.apim.portal.djb.testbed.dto.DjbCredentialSecretDto;
-import com.eactive.apim.portal.djb.testbed.dto.DjbTestbedContextDto;
-import com.eactive.apim.portal.djb.testbed.dto.DjbTestbedContextDto.GatewayInfo;
-import com.eactive.apim.portal.djb.testbed.enums.DjbAuthType;
-import com.eactive.apim.portal.portaluser.entity.PortalUserEnums.RoleCode;
-import com.eactive.eai.data.entity.onl.message.EAIMessageEntity;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.stereotype.Service;
-
-/**
- * 테스트베드 인증 컨텍스트 구성 · 앱 시크릿 조회 · authtype 매핑.
- * 인증/역할/소유권 검증은 이 서비스에서 수행한다({@code SecurityFilterChain} 은 URL 인가 블록이 없음).
- */
-@Service
-@RequiredArgsConstructor
-public class DjbTestbedAuthService {
-
-    private final CredentialRepository credentialRepository;
-    private final EAIMessageRepository eaiMessageRepository;
-    private final DjbTestbedGatewayProperty gatewayProperty;
-
-    private static final String APP_STATUS_ACTIVE = "1";
-
-    /**
-     * 비대상 사유: {@code ANONYMOUS}(비로그인) / {@code INDIVIDUAL_USER}(ROLE_USER) /
-     * {@code NO_CREDENTIAL}(appstatus='1' 앱 0건). 하나라도 해당하면 {@code eligible=false}.
-     */
-    public DjbTestbedContextDto buildContext(String portalOrigin) {
-        GatewayInfo gateway = buildGatewayInfo(portalOrigin);
-
-        if (!SecurityUtil.isAuthenticated()) {
-            return notEligible("ANONYMOUS", gateway);
-        }
-        PortalAuthenticatedUser user = SecurityUtil.getPortalAuthenticatedUser();
-        if (user.getRoleCode() == RoleCode.ROLE_USER) {
-            return notEligible("INDIVIDUAL_USER", gateway);
-        }
-
-        String orgId = SecurityUtil.getUserOrg().getId();
-        List<DjbCredentialOptionDto> options = credentialRepository.findAllByOrgid(orgId).stream()
-                .filter(c -> APP_STATUS_ACTIVE.equals(c.getAppstatus()))
-                .map(this::toOption)
-                .collect(Collectors.toList());
-
-        if (options.isEmpty()) {
-            return notEligible("NO_CREDENTIAL", gateway);
-        }
-
-        return DjbTestbedContextDto.builder()
-                .eligible(true)
-                .reason(null)
-                .credentials(options)
-                .gateway(gateway)
-                .build();
-    }
-
-    /**
-     * 선택 앱의 시크릿 단건. 로그인 + 비-ROLE_USER + 본인 소유(orgId 일치) 검증 후 반환.
-     * 소유 불일치/비대상은 {@link AccessDeniedException}(→ 403).
-     */
-    public DjbCredentialSecretDto getCredentialSecret(String clientId, String apiId) {
-        if (!SecurityUtil.isAuthenticated()) {
-            throw new AccessDeniedException("로그인이 필요합니다.");
-        }
-        PortalAuthenticatedUser user = SecurityUtil.getPortalAuthenticatedUser();
-        if (user.getRoleCode() == RoleCode.ROLE_USER) {
-            throw new AccessDeniedException("개인사용자는 이용할 수 없습니다.");
-        }
-
-        String orgId = SecurityUtil.getUserOrg().getId();
-        Credential credential = credentialRepository.findByClientidAndOrgid(clientId, orgId)
-                .orElseThrow(() -> new AccessDeniedException("본인 소유의 앱이 아닙니다."));
-
-        DjbAuthType authType = resolveAuthType(apiId);
-
-        return DjbCredentialSecretDto.builder()
-                .clientId(credential.getClientid())
-                .clientSecret(credential.getClientsecret())
-                .authType(authType)
-                .build();
-    }
-
-    /**
-     * apiId(=TSEAIHE01.eaisvcname, admin 입력 컨벤션)로 authtype 조회 후 매핑.
-     * 미매핑/미존재는 {@code DjbUnsupportedAuthTypeException}(→ 400).
-     */
-    public DjbAuthType resolveAuthType(String apiId) {
-        String authtype = eaiMessageRepository.findById(apiId)
-                .map(EAIMessageEntity::getAuthtype)
-                .orElse(null);
-        return DjbAuthType.fromAuthtype(authtype);
-    }
-
-    private DjbCredentialOptionDto toOption(Credential c) {
-        return DjbCredentialOptionDto.builder()
-                .clientId(c.getClientid())
-                .clientName(c.getClientname())
-                .appStatus(c.getAppstatus())
-                .build();
-    }
-
-    private GatewayInfo buildGatewayInfo(String portalOrigin) {
-        return GatewayInfo.builder()
-                .mode(gatewayProperty.resolveGatewayMode())
-                .baseUrl(gatewayProperty.baseUrl())
-                .tokenUrl(gatewayProperty.resolveTokenUrl(portalOrigin))
-                .apiKeyHeader(gatewayProperty.apiKeyHeader())
-                .oauthTokenHeader(gatewayProperty.oauthHeader())
-                .build();
-    }
-
-    private DjbTestbedContextDto notEligible(String reason, GatewayInfo gateway) {
-        return DjbTestbedContextDto.builder()
-                .eligible(false)
-                .reason(reason)
-                .credentials(Collections.emptyList())
-                .gateway(gateway)
-                .build();
-    }
-}

src/main/java/com/eactive/apim/portal/djb/testbed/service/DjbTestbedSpecServerRewriter.java

@@ -1,110 +0,0 @@
-package com.eactive.apim.portal.djb.testbed.service;
-
-import com.eactive.apim.portal.apispec.entity.ApiSpecInfo;
-import com.eactive.apim.portal.djb.testbed.config.DjbTestbedGatewayProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import javax.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
-/**
- * testbed spec(JSON)에 baking 된 서버 sentinel({@value #SERVER_SENTINEL})을
- * API SPEC 설정(responseType)에 따른 실주소로 치환한다.
- *
- * <ul>
- *   <li>gw     : {@link DjbTestbedGatewayProperty#resolveApiBaseUrl}(GW base URL, 단일 기준)</li>
- *   <li>mock   : {@code ApiSpecInfo.mockUrl}</li>
- *   <li>sample(기본) : 요청 포탈 origin(scheme://host)</li>
- * </ul>
- *
- * <p>spec 의 서버주소는 Swagger UI path 표시 + cURL 스니펫용이다(실호출은 {@code /api/call-api} 프록시).
- * admin(app.js buildOpenApiSpec)은 env별 실주소를 저장시 굳히지 않고 sentinel 만 path 앞에 baking 하며,
- * 실제 치환은 이 서비스가 spec 제공 시점에 수행한다. 또한 동일 spec 을 YAML 로 변환 제공한다.
- *
- * <p>sentinel 문자열은 유일하므로 문자열 치환으로 처리한다(없으면 원본 유지, 멱등).
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class DjbTestbedSpecServerRewriter {
-
-    /** admin(app.js buildOpenApiSpec)이 path 앞에 baking 하는 고정 서버 sentinel. */
-    public static final String SERVER_SENTINEL = "http://swagger-server-url";
-
-    private final DjbTestbedGatewayProperty gatewayProperty;
-    private final ObjectMapper objectMapper;
-
-    /** sentinel → 응답유형별 실주소 치환한 spec JSON 반환. sentinel 없거나 실주소 미확정 시 원본 유지. */
-    public String rewriteServer(String specJson, ApiSpecInfo spec, HttpServletRequest request) {
-        if (specJson == null || !specJson.contains(SERVER_SENTINEL)) {
-            return specJson;
-        }
-        String base = stripTrailingSlash(resolveBase(spec, request));
-        if (!StringUtils.hasText(base)) {
-            return specJson;   // 실주소 미확정 시 sentinel 유지
-        }
-        return specJson.replace(SERVER_SENTINEL, base);
-    }
-
-    /** spec JSON → YAML 문자열. 변환 실패 시 JSON 원본 반환. */
-    public String toYaml(String specJson) {
-        try {
-            Object tree = objectMapper.readValue(specJson, Object.class);
-            DumperOptions opts = new DumperOptions();
-            opts.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-            opts.setPrettyFlow(true);
-            return new Yaml(opts).dump(tree);
-        } catch (Exception e) {
-            log.error("spec YAML 변환 실패, JSON 원본 반환", e);
-            return specJson;
-        }
-    }
-
-    private String resolveBase(ApiSpecInfo spec, HttpServletRequest request) {
-        String rt = (spec == null || !StringUtils.hasText(spec.getResponseType()))
-                ? "sample" : spec.getResponseType().trim();
-        if ("gw".equalsIgnoreCase(rt)) {
-            return gatewayProperty.resolveApiBaseUrl(originOf(request));
-        }
-        if ("mock".equalsIgnoreCase(rt)) {
-            String mock = (spec == null) ? null : spec.getMockUrl();
-            return StringUtils.hasText(mock) ? mock.trim() : originOf(request);
-        }
-        // sample(기본): 포탈 origin
-        return originOf(request);
-    }
-
-    /** 요청 기준 포탈 origin(scheme://host[:port]) — 리버스 프록시 X-Forwarded-* 우선. */
-    public static String originOf(HttpServletRequest request) {
-        if (request == null) {
-            return "";
-        }
-        String scheme = firstNonBlank(request.getHeader("X-Forwarded-Proto"), request.getScheme());
-        String host = firstNonBlank(request.getHeader("X-Forwarded-Host"), request.getHeader("Host"));
-        if (StringUtils.hasText(host)) {
-            return scheme + "://" + host.trim();
-        }
-        int port = request.getServerPort();
-        String hostPort = request.getServerName() + ((port == 80 || port == 443) ? "" : ":" + port);
-        return scheme + "://" + hostPort;
-    }
-
-    private static String firstNonBlank(String a, String b) {
-        return StringUtils.hasText(a) ? a.trim() : b;
-    }
-
-    private static String stripTrailingSlash(String s) {
-        if (s == null) {
-            return null;
-        }
-        String t = s.trim();
-        while (t.endsWith("/")) {
-            t = t.substring(0, t.length() - 1);
-        }
-        return t;
-    }
-}

src/main/resources/application-dev.yml

@@ -7,8 +7,8 @@ spring:
   jpa:
     properties:
       hibernate:
-        show_sql: false
-        format_sql: false
+        show_sql: true
+        format_sql: true
         use_sql_comments: true
   devtools:
     restart:

src/main/resources/application.yml

@@ -2,13 +2,9 @@ server:
   servlet:
     context-path: /
     session:
-      # 물리 세션 타임아웃은 DB PortalProperty(Portal/session.timeout.minutes)로 관리한다.
-      # 로그인 성공 시 PortalAuthenticationSuccessHandler 가
-      #   session.setMaxInactiveInterval(session.timeout.minutes * 60) 으로 적용 → 물리=논리 일치.
-      # 익명/로그인 전 세션은 컨테이너 기본값으로 fallback (weblogic.xml <timeout-secs>1800).
-      # timeout: 10m
+      timeout: 10m
       cookie:
-        name: JSESSIONID_PORTAL
+        name: PORTAL_JSESSIONID
     encoding:
       charset: UTF-8
   port: '39130'
@@ -318,9 +314,6 @@ page:
           faq_list:
             name: FAQ
             path: "/faq_list"
-          faq_detail:
-            name: FAQ
-            path: "/faq_view"
           inquiry:
             name: "Q&A"
             path: "/inquiry"
@@ -385,6 +378,9 @@ page:
           myapikey_modify_step3:
             name: "앱 수정 요청 완료"
             path: "/myapikey/modify/step3"
+          commission:
+            name: "과금 관리"
+            path: "/commission/manage"
           api_statistics:
             name: "이용 통계"
             path: "/statistics/api"