92 Commits

Author SHA1 Message Date
Rinjae b7c8e7f41c API 그룹 팝업 JSP 추가 - Swagger Validator JS 등록 - Summernote CSS 추가
- API 그룹 팝업(djbApiGroupPopup.jsp) 화면 파일 추가
- Swagger Validator (djb-swagger-validator.js) 및 관련 리팩토링
- Summernote 콘텐츠 스타일 정의 (editor-content.css) 추가
2026-07-03 16:54:47 +09:00
Rinjae 6c0fca22f3 DJB OpenAPI 편집기 초기 코드 업로드:
- 앱 상태 관리 및 기본 렌더 함수 추가 (vanilla JS)
- OpenAPI 스펙 빌더 초기 구현 (v3.1 대응)
- 스텝별 렌더 함수 및 UI 구축
2026-07-02 18:17:58 +09:00
Rinjae 18489e2440 Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
2026-06-30 19:40:30 +09:00
Rinjae 681e4bd014 법인 정보 삭제 시 민감 데이터 초기화 메서드 적용:
- `clearSensitiveDataOnRemoval` 메서드 추가/적용
2026-06-30 19:40:23 +09:00
eastargh 27abe51b7b 로그인 2-factor 인증
eapim-admin CI / build (push) Has been cancelled
2026-06-30 15:49:39 +09:00
eastargh 55ef71c5e7 화면 수정
eapim-admin CI / build (push) Has been cancelled
2026-06-30 14:19:01 +09:00
Rinjae 235f4b67b3 Jenkinsfile 및 Gradle 제거/최적화:
eapim-admin CI / build (push) Has been cancelled
- EXT_LIB_DIR 환경변수 및 관련 빌드 파라미터 제거
- build.gradle: 불필요 코드/설정 제거 및 의존성 최적화
2026-06-30 11:29:02 +09:00
Rinjae 89c4b89a71 Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
2026-06-30 09:28:03 +09:00
Rinjae 7193070ebd Jenkinsfile 수정:
- EXT_LIB_DIR 환경변수 추가
- Gradle 빌드에 extLibDir 파라미터 적용
2026-06-30 09:27:58 +09:00
rinjae 49616cdd84 build.gradle 업데이트
eapim-admin CI / build (push) Has been cancelled
2026-06-30 09:27:38 +09:00
Rinjae d1683cc319 전화번호 정규화 적용: 숫자 추출 유틸(PhoneNumberUtil) 활용
eapim-admin CI / build (push) Has been cancelled
2026-06-30 09:05:44 +09:00
Rinjae b5ba2c2bee Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
2026-06-29 18:39:25 +09:00
Rinjae baa528a628 전화번호 정규화 유틸 추가 및 적용:
- PhoneNumberUtil 도입: 한국번호 정규화/숫자 추출 지원
- 유틸 적용: 모든 저장 및 조회에 정규형 강제
- 초대 매칭 오류 수정: 휴대폰 형식 차이 대응
2026-06-29 18:26:15 +09:00
eastargh f49814b2a1 개발서버 로그설정
eapim-admin CI / build (push) Has been cancelled
2026-06-29 16:09:58 +09:00
eastargh 0ea73aa66f 공용톰켓으로 이동 2026-06-29 16:01:14 +09:00
eastargh ed44183de3 배치잡 Reload시 data도 reload되도록 수정
eapim-admin CI / build (push) Has been cancelled
2026-06-29 13:32:08 +09:00
eastargh aee02cc2a6 검색조건 답변종료 추가
eapim-admin CI / build (push) Has been cancelled
2026-06-29 13:12:06 +09:00
eastargh 99b4470ffe CLUSTERED에서도 실행되도록 변경
eapim-admin CI / build (push) Has been cancelled
2026-06-29 10:57:26 +09:00
eastargh d9201eb603 담당자연락처 암복호화
eapim-admin CI / build (push) Has been cancelled
2026-06-26 14:08:22 +09:00
eastargh 185a23d748 관리자 로그인 비밀번호 damo 암호화 적용
eapim-admin CI / build (push) Has been cancelled
2026-06-26 11:24:12 +09:00
eastargh 99a440094d 관리자 로그인 비밀번호 암호화 Damo 단방향 적용
eapim-admin CI / build (push) Has been cancelled
2026-06-26 11:12:21 +09:00
eastargh 37380f2975 유형 추가
eapim-admin CI / build (push) Has been cancelled
2026-06-26 10:35:05 +09:00
eastargh 908b2ebcc8 IIM연동 DJB 커스텀
eapim-admin CI / build (push) Has been cancelled
2026-06-25 11:42:09 +09:00
Rinjae 25a8e13752 앱/사용자 승인 및 거절 시 SMS 통지 로직 추가
eapim-admin CI / build (push) Has been cancelled
- 승인/거절 템플릿 변수 매핑 (APP_NAME, REASON 등)
- 법인 관리자 승인/거절 통지 로직 개선
2026-06-24 19:43:30 +09:00
eastargh 7928a0c27b 기관관리 - 리버스 프록시 경로 추가
eapim-admin CI / build (push) Has been cancelled
2026-06-24 16:38:00 +09:00
Rinjae 65ba6c1115 OBP 파트너코드 조회 기능 삭제
eapim-admin CI / build (push) Has been cancelled
- ObpPartnerCodeService 및 관련 컨트롤러 메서드 제거
- JSP에서 OBP 조회 버튼 및 관련 스크립트 제거
2026-06-24 15:44:40 +09:00
Rinjae 2dcf524cd6 XSS 문자 변환 제외 파라미터 추가 - subjectTemplate, smsTemplate 등
eapim-admin CI / build (push) Has been cancelled
2026-06-24 14:46:44 +09:00
Rinjae bb991cea81 Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
2026-06-23 19:27:47 +09:00
Rinjae 702a9a899b - 약관 유형에 개인정보수집동의서(PRIVACY_COLLECT) 항목 추가
- 관리화면 약관 유형 표시 시 '(사용안함)' 라벨 추가 처리
- 약관 유형 라벨 변환 로직 PortalTermsManService로 이동 및 적용
2026-06-23 19:27:37 +09:00
eastargh 7520b96ed5 UMS 발송
eapim-admin CI / build (push) Has been cancelled
2026-06-23 17:46:19 +09:00
eastargh 7935e69871 inbound adapter 변경시 inboundHttpMethod값 누락 버그 수정 2026-06-23 17:41:37 +09:00
eastargh 4cf6dc4da0 UMS 발송
eapim-admin CI / build (push) Has been cancelled
2026-06-23 14:50:03 +09:00
Rinjae a5d55f2647 WAR 파일 해시 파일 확장자 변경 및 MD5SUM 추가
eapim-admin CI / build (push) Has been cancelled
2026-06-23 13:58:02 +09:00
eastargh af8b925e65 서버 기동 인자에 따라 암복호화 실행
eapim-admin CI / build (push) Has been cancelled
2026-06-23 10:41:45 +09:00
eastargh 62ae2d93ff converter 직접 생성하여 사용 2026-06-23 10:35:39 +09:00
eastargh 124ecabccf 로그조회 업무데이타 복호화 처리 2026-06-23 10:21:10 +09:00
Rinjae c521835633 - 사용자 검색 시 암호화 필드 처리 로직 개선: 부분검색 제거 및 정확일치 검색 추가.
eapim-admin CI / build (push) Has been cancelled
- UI에 암호화 필드 검색 제한 안내 추가.
- 개인정보 마스킹 규칙 확대: 이름/ID/전화번호 모두 적용.
2026-06-22 19:21:08 +09:00
Rinjae fe201b88cd Merge Gitea master into z-eactive master
eapim-admin CI / build (push) Has been cancelled
2026-06-22 17:24:22 +09:00
Rinjae 9f81ad697d Merge remote-tracking branch 'origin/master' 2026-06-22 17:03:41 +09:00
Rinjae ca94f2e70a 휴대폰번호 중복 사용자 조회 기능 추가
- 중복 사용자 필터링 및 목록 조회 기능 구현
- 중복 사용자 알림 배너 및 상세 조회 UI 개선
- 중복 허용 여부 설정 동기화 및 관련 서비스 추가
2026-06-22 17:03:33 +09:00
eastargh 97937a8a35 UMS 발송 2026-06-22 16:56:20 +09:00
eastargh a8e124db5d Merge branch 'master' of https://git.eactive.synology.me:8090/eapim/djbank/eapim-admin.git
eapim-admin CI / build (push) Has been cancelled
2026-06-22 16:31:39 +09:00
eastargh a514b9d7a9 UMS 정리 2026-06-22 16:31:27 +09:00
Rinjae 2ac61636a0 Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
2026-06-22 16:29:58 +09:00
Rinjae 399bd9c58d Damo 적용 준비 코드
- KjbNotRnnoJpaAttributeConverter 삭제 및 PersonalDataEncryptConverter 추가
- damo-manager 지원을 위한 JSP 추가 및 레거시 암호화 마이그레이션 컨트롤러 구현
- 기존 엔티티 암호화 로직 변경 및 build.gradle에 damo-manager 의존성 추가
2026-06-22 16:29:45 +09:00
eastargh b8beeb7c3e Merge branch 'master' of https://git.eactive.synology.me:8090/eapim/djbank/eapim-admin.git
eapim-admin CI / build (push) Has been cancelled
2026-06-22 13:40:24 +09:00
eastargh 0bb00b4fb9 프라퍼티 암호화 기능 추가 2026-06-22 13:40:13 +09:00
Rinjae 655c35b1e1 - 메시지 발송 내역 화면 추가: 조회/상세/상태변경(PENDING→FAILED)
eapim-admin CI / build (push) Has been cancelled
- 본문·수신자 마스킹 유틸(MessagePatternMaskingUtils) 개발
- 안전 HTML 생성 마스킹/검증 테스트 및 JSP 바인딩
2026-06-19 19:40:15 +09:00
Rinjae efd1c748ed Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
2026-06-19 17:17:50 +09:00
Rinjae 64a9c7408e - 사용자 조회 시 방어적 로직 추가: 삭제된 사용자 처리
- PortalFaq/PortalInquiry 컨벤션 동일 적용
2026-06-19 17:17:45 +09:00
eastargh 8f9411f990 Merge branch 'master' of https://git.eactive.synology.me:8090/eapim/djbank/eapim-admin.git
eapim-admin CI / build (push) Has been cancelled
2026-06-19 13:43:52 +09:00
eastargh ed1f55c534 유량제어 서버버킷 조회 port 변경 2026-06-19 13:43:36 +09:00
Rinjae d1392821ef Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
2026-06-19 11:23:13 +09:00
Rinjae 6542b0c0f8 - 메인 화면 serviceType 설정 수정: session/localStorage 분리
- emergency.jsp JSTL core 태그 추가
2026-06-19 11:23:07 +09:00
Rinjae-gf63 f7de1b6885 Merge remote-tracking branch 'origin/master'
eapim-admin CI / build (push) Has been cancelled
2026-06-18 17:58:26 +09:00
Rinjae-gf63 3e32220061 포탈 공지사항 관리 - 콤보 로드 후 그리드 생성으로 경합 방지 2026-06-18 17:57:37 +09:00
Rinjae 10db8129eb 마스킹 표준화 적용 (eapim-admin/portal/JS)
eapim-admin CI / build (push) Has been cancelled
- admin: elink-online-core 표준 위임(e메일/이름/전화/IP)으로 규칙 일원화
- portal/JS: 표준 로직 직접 구현 + 기존 owner 비마스킹 유지
- 호출처 무수정/인라인 중복 제거/테스트 통과
2026-06-18 17:56:32 +09:00
Rinjae e34829437d 피드백/개선요청 삭제 로직 수정
eapim-admin CI / build (push) Has been cancelled
- 삭제 버튼 UI 개선 및 상세 페이지 삭제 기능 추가
- audit log에 DELETE 이벤트 추가
2026-06-18 16:45:28 +09:00
Rinjae-gf63 ef3f0e802a - 사용자 ID 검증 로직 추가 (PortalUserService)
eapim-admin CI / build (push) Has been cancelled
- 사업제휴 관리 > 삭제/다중 삭제 기능 추가 및 화면 수정
- 피드백/개선 요청으로 명칭 변경 (사업제휴 관리)
2026-06-18 16:31:22 +09:00
rinjae b741a7e563 Jenkinsfile 업데이트
eapim-admin CI / build (push) Has been cancelled
2026-06-18 12:17:49 +09:00
rinjae e8069ef371 Jenkinsfile 업데이트
eapim-admin CI / build (push) Has been cancelled
2026-06-18 12:10:31 +09:00
rinjae c0e218451e Jenkinsfile 추가
eapim-admin CI / build (push) Has been cancelled
2026-06-18 11:42:30 +09:00
eastargh af63b1a256 배치잡 기본에서 클러스터로 수정시 next fire time =null인 버그 수정
eapim-admin CI / build (push) Has been cancelled
2026-06-18 11:05:26 +09:00
eastargh 02072df973 api사용현황 수정
eapim-admin CI / build (push) Has been cancelled
2026-06-18 09:17:58 +09:00
eastargh bc478ad4ed 배치잡 수정시 clustered에 무조건 추가되는 버그 수정
eapim-admin CI / build (push) Has been cancelled
2026-06-17 10:58:00 +09:00
Rinjae 161a68a0a2 - Tomcat readiness probe 타임아웃 180s → 300s 연장
eapim-admin CI / build (push) Has been cancelled
- readiness probe URL /monitoring/login.do → /monitoring/loginForm.do 수정
- readiness 실패 시 로그 출력 내용 및 포트 점검 추가
2026-06-16 18:46:28 +09:00
Rinjae-gf63 3b59f7acd7 Merge branch 'master' of ssh://172.30.1.50:2222/djb-eapim/eapim-admin
eapim-admin CI / build (push) Has been cancelled
2026-06-16 16:44:16 +09:00
Rinjae-gf63 1e29d1d721 Merge remote-tracking branch 'origin/master' into master
Resolve conflict in PortalNoticeManService.java import block:
union both sides — keep Arrays (HEAD) and LocalDateTime/ArrayList/Collections (origin/master),
all of which are used in the merged body.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-16 16:41:57 +09:00
Rinjae-gf63 9342b6484c 포탈 공지사항 삭제 기능 추가 / ADM -> APP 2026-06-16 16:37:56 +09:00
eastargh dc3842aa9b 배치잡 CLUSTERED 기능 추가
eapim-admin CI / build (push) Has been cancelled
2026-06-16 16:33:55 +09:00
eastargh a440ac842d API상태 변화 감지 (점검 게시판 적용)
eapim-admin CI / build (push) Has been cancelled
2026-06-16 16:05:44 +09:00
Rinjae df5bbb162a ci 수정
eapim-admin CI / build (push) Has been cancelled
2026-06-16 15:56:46 +09:00
Rinjae 3eec267769 Merge commit '58fe176715b2027f783a2dae98e1583beaf34c8c'
eapim-admin CI / build (push) Has been cancelled
2026-06-16 15:48:41 +09:00
Rinjae 6ab7e1fe16 ci 수정 2026-06-16 15:48:30 +09:00
eastargh 58fe176715 조회시 정렬순서 추가
eapim-admin CI / build (push) Has been cancelled
2026-06-16 15:05:48 +09:00
Rinjae 6b6e2863cd 공지사항 관리 - 장애 점검 등록 UI 추가
eapim-admin CI / build (push) Has been cancelled
2026-06-16 14:55:39 +09:00
eastargh cfafccc34d CA 인증타입 제거
eapim-admin CI / build (push) Has been cancelled
2026-06-16 14:32:35 +09:00
eastargh fe98ac45c4 Merge branch 'master' of https://git.eactive.synology.me:8090/eapim/djbank/eapim-admin 2026-06-16 14:26:21 +09:00
eastargh 5f9de93d35 인증타입 CA 제거 2026-06-16 14:19:27 +09:00
Rinjae 48dfcf7714 Merge branch 'feats/ci-test'
eapim-admin CI / build (push) Has been cancelled
2026-06-16 13:22:38 +09:00
Rinjae 6e3906878a Merge commit 'fafe7e45cb35b7475cdc54f6b390b6c4845777d5' 2026-06-16 13:21:55 +09:00
eastargh fafe7e45cb 서버명 표시 2026-06-16 13:19:10 +09:00
eastargh eee7f46aa7 ums 관련 수정 2026-06-16 11:10:36 +09:00
eastargh b5eb63448a 레이아웃 기본 데이타타입 Boolean 추가 2026-06-15 17:52:34 +09:00
eastargh 54291e5cbb ums 관련 정리 2026-06-15 13:16:23 +09:00
Rinjae a0743465ab - generic package 업로드 단계 제거
eapim-admin CI / build (push) Has been cancelled
- 인증 정리 전까지 artifact만 업로드 유지
2026-06-12 20:51:36 +09:00
Rinjae d3e05256b7 - package upload 인증 헤더 방식 변경
- basic oauth2 user → Authorization token 헤더
2026-06-12 20:28:17 +09:00
Rinjae 4d5572f880 로그 설정 변경
eapim-admin CI / build (push) Has been cancelled
2026-06-12 19:43:33 +09:00
Rinjae e21014f992 - gitea actions 워크플로우 추가
- 7개 sibling clone 후 monitoring.war 빌드
- systemd user unit으로 tomcat 라이프사이클 분리
- /monitoring/login.do 로 readiness probe (120s)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-12 19:39:01 +09:00
eastargh ac0d081a9a 인터페이스 아웃바운드 path에 {} 포함시 variableUrlRequest로 설정 2026-06-12 10:18:39 +09:00
eastargh 164ab92919 BAP 서버 목록조회 쿼리에 rownum=1 제거 2026-06-12 09:27:08 +09:00
eastargh a6e7d1adb3 아웃바운드 URL restoption type 판단시 {}안에 .도 포함되도록 변경 2026-06-11 11:38:38 +09:00
131 changed files with 7897 additions and 658 deletions
+140
View File
@@ -0,0 +1,140 @@
name: eapim-admin CI
on:
push:
branches:
- master
- develop
- stage
- feats/ci-test
jobs:
build:
runs-on: [self-hosted, linux, eapim-admin]
env:
JAVA_HOME: /apps/opts/jdk8
JAVA_HOME_TOMCAT: /apps/opts/jdk17
CATALINA_BASE: /prod/eapim/adminportal
CATALINA_HOME: /prod/eapim/apache-tomcat-9.0.116
CATALINA_PID: /prod/eapim/adminportal/temp/catalina.pid
DEPLOY_HTTP_PORT: "39120"
defaults:
run:
working-directory: eapim-admin
steps:
- name: Checkout eapim-admin (trigger SHA)
uses: http://172.30.1.50:3000/actions/checkout@v4
with:
path: eapim-admin
- name: Checkout sibling modules (master)
working-directory: ${{ github.workspace }}
run: |
set -e
mkdir -p eapim-online
# eapim-online/* — 5 modules referenced from settings.gradle
for REPO in elink-online-core elink-online-core-jpa elink-online-transformer elink-online-common elink-online-emsclient; do
rm -rf "eapim-online/$REPO"
git clone --depth=1 --branch master \
http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/$REPO.git \
"eapim-online/$REPO"
done
# standalone siblings
for REPO in elink-portal-common eapim-admin-djb; do
rm -rf "$REPO"
git clone --depth=1 --branch master \
http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/$REPO.git \
"$REPO"
done
- name: Verify toolchain
run: |
java -version
gradle --version
- name: Gradle build (no tests)
run: gradle clean build -x test --no-daemon
- name: Upload WAR artifact
uses: http://172.30.1.50:3000/actions/upload-artifact@v3
with:
name: eapim-admin-war-${{ github.sha }}
path: eapim-admin/build/libs/eapim-admin.war
if-no-files-found: error
- name: Stop tomcat (pre-clean)
working-directory: ${{ github.workspace }}
run: |
# 1) systemd 관리 인스턴스 정지 (이번 워크플로가 띄운 것)
systemctl --user stop eapim-admin 2>/dev/null || true
# 2) systemd 외부 detached 인스턴스 정리
if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then
JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
for i in $(seq 1 30); do
[ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break
sleep 1
done
fi
rm -f "$CATALINA_PID"
- name: Deploy war as /monitoring
working-directory: ${{ github.workspace }}
run: |
DEPLOY_DIR="$CATALINA_BASE/webapps"
rm -rf "$DEPLOY_DIR/monitoring" "$DEPLOY_DIR/monitoring.war"
cp eapim-admin/build/libs/eapim-admin.war "$DEPLOY_DIR/monitoring.war"
ls -la "$DEPLOY_DIR"
- name: Start tomcat and readiness probe (timeout 300s)
working-directory: ${{ github.workspace }}
run: |
LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log"
BEFORE=0
[ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG")
# systemd 가 Tomcat 을 새 cgroup 으로 띄움 — runner step 종료와 무관하게 살아남음
systemctl --user start eapim-admin
# /loginForm.do 는 GET 매핑(MainController#loginForm) → tomcat·webapp 양쪽 살아있으면 200
# /login.do 는 POST 처리 — GET 으로 probe 시 405/잘못된 응답 가능성 있어 회피
PROBE_URL="http://localhost:$DEPLOY_HTTP_PORT/monitoring/loginForm.do"
DEADLINE=$(($(date +%s) + 300))
STATUS=000
while [ $(date +%s) -lt $DEADLINE ]; do
STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \
"$PROBE_URL" 2>/dev/null || echo "000")
case "$STATUS" in
200|302|401)
echo "Readiness OK ($PROBE_URL HTTP $STATUS)"
break
;;
esac
if [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | grep -qE "Application listener .* Exception|SEVERE.*startup.Catalina"; then
echo "::error::Startup error detected in log"
tail -c +$((BEFORE+1)) "$LOG" | tail -80
exit 1
fi
sleep 2
done
case "$STATUS" in
200|302|401) ;;
*)
echo "::error::Readiness probe failed within 300s (last HTTP status: $STATUS)"
echo "--- last 300 lines of catalina log ---"
[ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -300
echo "--- systemd unit status ---"
systemctl --user status eapim-admin --no-pager || true
echo "--- listening ports ---"
ss -tlnp 2>/dev/null | grep -E ":$DEPLOY_HTTP_PORT\b" || echo "(port $DEPLOY_HTTP_PORT 미점유)"
exit 1
;;
esac
echo "--- key boot log lines ---"
tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true
Vendored
+180
View File
@@ -0,0 +1,180 @@
pipeline {
agent { label 'djb-vm' }
options {
timestamps()
disableConcurrentBuilds()
buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20'))
}
environment {
JAVA_HOME = '/apps/opts/jdk8'
JAVA_HOME_TOMCAT = '/apps/opts/jdk17'
GRADLE_HOME = '/apps/opts/gradle-8.7'
GRADLE_USER_HOME = '/apps/opts/gradle-home'
NODE_HOME = '/apps/opts/node-v24'
PATH = "/apps/opts/jdk8/bin:/apps/opts/gradle-8.7/bin:/apps/opts/node-v24/bin:/apps/opts/bin:${env.PATH}"
GIT_SSH_COMMAND = 'ssh -o StrictHostKeyChecking=accept-new'
CATALINA_BASE = '/prod/eapim/adminportal'
CATALINA_HOME = '/prod/eapim/apache-tomcat-9.0.116'
CATALINA_PID = '/prod/eapim/adminportal/temp/catalina.pid'
DEPLOY_HTTP_PORT = '39120'
}
stages {
stage('Checkout') {
steps {
checkout scm
}
}
stage('Checkout dependencies') {
steps {
sh '''
set -eu
cd "$WORKSPACE/.."
mkdir -p eapim-online
for REPO in elink-online-core elink-online-core-jpa elink-online-transformer elink-online-common elink-online-emsclient; do
TARGET="eapim-online/$REPO"
if [ ! -d "$TARGET/.git" ]; then
rm -rf "$TARGET"
git clone --depth=1 --branch master \
"ssh://git@172.30.1.50:2222/djb-eapim/$REPO.git" \
"$TARGET"
else
git -C "$TARGET" fetch --depth=1 origin master
git -C "$TARGET" reset --hard origin/master
git -C "$TARGET" clean -fdx
fi
done
for REPO in elink-portal-common eapim-admin-djb; do
if [ ! -d "$REPO/.git" ]; then
rm -rf "$REPO"
git clone --depth=1 --branch master \
"ssh://git@172.30.1.50:2222/djb-eapim/$REPO.git" \
"$REPO"
else
git -C "$REPO" fetch --depth=1 origin master
git -C "$REPO" reset --hard origin/master
git -C "$REPO" clean -fdx
fi
done
'''
}
}
stage('Verify toolchain') {
steps {
sh '''
set -eu
java -version
gradle --version
'''
}
}
stage('Build WAR') {
steps {
sh 'gradle clean build -x test --no-daemon'
}
post {
success {
sh '''
set -eu
cd build/libs
sha1sum eapim-admin.war > eapim-admin.war.sha1
sha256sum eapim-admin.war > eapim-admin.war.sha256
md5sum eapim-admin.war > eapim-admin.war.md5
'''
archiveArtifacts artifacts: 'build/libs/eapim-admin.war,build/libs/eapim-admin.war.sha1,build/libs/eapim-admin.war.sha256,build/libs/eapim-admin.war.md5', fingerprint: true
}
}
}
stage('Stop Tomcat') {
steps {
sh '''
set +e
systemctl --user stop eapim-admin 2>/dev/null
if [ -f "$CATALINA_PID" ] && kill -0 "$(cat "$CATALINA_PID")" 2>/dev/null; then
JAVA_HOME="$JAVA_HOME_TOMCAT" "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
for i in $(seq 1 30); do
[ -f "$CATALINA_PID" ] && kill -0 "$(cat "$CATALINA_PID")" 2>/dev/null || break
sleep 1
done
fi
rm -f "$CATALINA_PID"
'''
}
}
stage('Deploy monitoring.war') {
steps {
sh '''
set -eu
DEPLOY_DIR="$CATALINA_BASE/webapps"
rm -rf "$DEPLOY_DIR/monitoring" "$DEPLOY_DIR/monitoring.war"
cp build/libs/eapim-admin.war "$DEPLOY_DIR/monitoring.war"
ls -la "$DEPLOY_DIR"
'''
}
}
stage('Start Tomcat and readiness') {
steps {
sh '''
set -eu
LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log"
BEFORE=0
[ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG")
systemctl --user start eapim-admin
PROBE_URL="http://localhost:$DEPLOY_HTTP_PORT/monitoring/loginForm.do"
DEADLINE=$(($(date +%s) + 300))
STATUS=000
while [ "$(date +%s)" -lt "$DEADLINE" ]; do
STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \
"$PROBE_URL" 2>/dev/null || echo "000")
case "$STATUS" in
200|302|401)
echo "Readiness OK ($PROBE_URL HTTP $STATUS)"
break
;;
esac
if [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | grep -qE "Application listener .* Exception|SEVERE.*startup.Catalina"; then
echo "Startup error detected in log"
tail -c +$((BEFORE+1)) "$LOG" | tail -80
exit 1
fi
sleep 2
done
case "$STATUS" in
200|302|401) ;;
*)
echo "Readiness probe failed within 300s, last HTTP status: $STATUS"
echo "--- last 300 lines of catalina log ---"
[ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -300
echo "--- systemd unit status ---"
systemctl --user status eapim-admin --no-pager || true
echo "--- listening ports ---"
ss -tlnp 2>/dev/null | grep -E ":$DEPLOY_HTTP_PORT\\b" || echo "(port $DEPLOY_HTTP_PORT not listening)"
exit 1
;;
esac
echo "--- key boot log lines ---"
tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true
'''
}
}
}
}
@@ -115,7 +115,7 @@
</bean> </bean>
<bean id="ioAcceptor" class="com.eactive.eai.rms.onl.server.UdpServer" init-method="init" destroy-method="destory"> <bean id="ioAcceptor" class="com.eactive.eai.rms.onl.server.UdpServer" init-method="init" destroy-method="destory">
<property name="port" value="10800" /> <property name="port" value="39126" />
<property name="handler" ref="handler"/> <property name="handler" ref="handler"/>
</bean> </bean>
+3 -2
View File
@@ -12,6 +12,7 @@ PortalTermsManController_약관관리_APIGW_INSERT,UPDATE,DELETE
ProdClientManController_운영Client (키정보)관리_APIGW_INSERT,UPDATE,DELETE ProdClientManController_운영Client (키정보)관리_APIGW_INSERT,UPDATE,DELETE
ApiSpecController_API스펙관리_APIGW_INSERT,DELETE ApiSpecController_API스펙관리_APIGW_INSERT,DELETE
MessageTemplateManController_메세지템플릿관리_APIGW_INSERT,UPDATE,DELETE MessageTemplateManController_메세지템플릿관리_APIGW_INSERT,UPDATE,DELETE
PortalPartnershipManController_사업제휴신청관리_APIGW_UNMASK PortalPartnershipManController_피드백/개선요청관리_APIGW_UNMASK,DELETE
PortalPropertyController_포탈 프로퍼티 관리_APIGW_UPDATE PortalPropertyController_포탈 프로퍼티 관리_APIGW_UPDATE
PortalUserTermsManController_약관동의 이력_APIGW_UNMASK PortalUserTermsManController_약관동의 이력_APIGW_UNMASK
MessageRequestManController_메세지발송내역_APIGW_UPDATE_STATUS
+170
View File
@@ -0,0 +1,170 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ page import="java.lang.reflect.Method" %>
<%@ page import="org.apache.commons.lang3.StringUtils" %>
<%@ page import="com.eactive.eai.rms.common.login.SessionManager" %>
<%!
// 최소 HTML 이스케이프 (진단 페이지 XSS 방지)
private String esc(String s) {
if (s == null) return "";
StringBuilder b = new StringBuilder(s.length() + 16);
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
switch (c) {
case '&': b.append("&amp;"); break;
case '<': b.append("&lt;"); break;
case '>': b.append("&gt;"); break;
case '"': b.append("&quot;"); break;
case '\'': b.append("&#39;"); break;
default: b.append(c);
}
}
return b.toString();
}
%>
<%
// 로그인 사용자만 접근 — real 모드에서 운영 키 암복호화 오라클이 되지 않도록 보호
if (StringUtils.isBlank(SessionManager.getUserId(request))
&& StringUtils.isBlank(SessionManager.getRoleIdString(request))) {
response.sendRedirect(request.getContextPath() + "/loginForm.do");
return;
}
response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache");
response.setHeader("Expires", "0");
request.setCharacterEncoding("utf-8");
String op = request.getParameter("op");
String input = request.getParameter("input");
boolean run = request.getParameter("run") != null;
if (op == null) op = "encrypt";
if (input == null) input = "";
String mode = "UNKNOWN";
String revision = "-";
String returnCode = "-";
String result = "";
String error = "";
boolean loaded = false;
try {
Class<?> cls = Class.forName("com.eactive.ext.djb.DamoManager");
Object damo = cls.getMethod("getInstance").invoke(null);
loaded = true;
boolean bypass = (Boolean) cls.getMethod("isBypassMode").invoke(damo);
boolean fake = (Boolean) cls.getMethod("isFakeMode").invoke(damo);
mode = bypass ? "BYPASS" : (fake ? "FAKE" : "REAL");
revision = String.valueOf(cls.getMethod("getRevision").invoke(damo));
returnCode = String.valueOf(cls.getMethod("getReturnCode").invoke(damo));
if (run) {
if ("encrypt".equals(op)) {
result = (String) cls.getMethod("encrypt", String.class).invoke(damo, input);
} else if ("decrypt".equals(op)) {
result = (String) cls.getMethod("decrypt", String.class).invoke(damo, input);
} else if ("sha256".equals(op)) {
int t = cls.getField("SHA256").getInt(null);
result = (String) cls.getMethod("hash", int.class, String.class).invoke(damo, t, input);
} else if ("sha512".equals(op)) {
int t = cls.getField("SHA512").getInt(null);
result = (String) cls.getMethod("hash", int.class, String.class).invoke(damo, t, input);
} else {
error = "알 수 없는 op: " + op;
}
}
} catch (ClassNotFoundException e) {
error = "com.eactive.ext.djb.DamoManager 클래스를 찾을 수 없습니다. "
+ "damo-manager.jar 를 WAS lib (운영) 또는 WEB-INF/lib 에 배포하세요.";
} catch (Throwable t) {
// require-real fail-fast(ExceptionInInitializerError) 또는 초기화 실패(NoClassDefFoundError) 포함
Throwable c = (t.getCause() != null) ? t.getCause() : t;
error = c.toString();
if (c instanceof NoClassDefFoundError
|| error.contains("require-real")
|| error.contains("Could not initialize")) {
error += " (※ -Ddamo-manager.require-real=true 인데 scpdb 가 없어 기동에 실패했을 수 있습니다. "
+ "scpdb 를 갖추거나 옵션을 내리세요.)";
}
}
String badgeColor = "REAL".equals(mode) ? "#1a7f37"
: "BYPASS".equals(mode) ? "#9a3412"
: "FAKE".equals(mode) ? "#9a6700" : "#6e7781";
%>
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>DamoManager 테스트</title>
<style>
body { font-family: -apple-system, "Malgun Gothic", sans-serif; margin: 24px; color: #24292f; }
h1 { font-size: 20px; margin: 0 0 4px; }
.sub { color: #6e7781; font-size: 13px; margin-bottom: 16px; }
.badge { display:inline-block; color:#fff; padding:2px 10px; border-radius:12px; font-size:12px; font-weight:600; background:<%= badgeColor %>; }
.meta { font-size:12px; color:#57606a; margin-left:8px; }
.card { border:1px solid #d0d7de; border-radius:8px; padding:16px; max-width:760px; }
label { display:block; font-size:13px; font-weight:600; margin:12px 0 4px; }
textarea, select { width:100%; box-sizing:border-box; font-size:14px; padding:8px; border:1px solid #d0d7de; border-radius:6px; font-family:ui-monospace, Menlo, monospace; }
textarea { height:90px; resize:vertical; }
.row { display:flex; gap:12px; }
.row > div { flex:1; }
button { margin-top:14px; background:#1f6feb; color:#fff; border:0; border-radius:6px; padding:9px 18px; font-size:14px; font-weight:600; cursor:pointer; }
.result { margin-top:16px; }
.out { background:#f6f8fa; border:1px solid #d0d7de; border-radius:6px; padding:12px; white-space:pre-wrap; word-break:break-all; font-family:ui-monospace, Menlo, monospace; font-size:13px; min-height:20px; }
.err { color:#cf222e; background:#fff5f5; border-color:#ffc1c1; }
.hint { font-size:12px; color:#6e7781; margin-top:18px; line-height:1.6; }
code { background:#eff1f3; padding:1px 5px; border-radius:4px; }
</style>
</head>
<body>
<h1>DamoManager 테스트</h1>
<div class="sub">웹에서 encrypt / decrypt / hash 동작을 즉시 확인 (eapim-admin)</div>
<div class="card">
<div>
<% if (loaded) { %>
<span class="badge"><%= mode %> MODE</span>
<span class="meta">revision=<%= esc(revision) %> · returnCode=<%= esc(returnCode) %></span>
<% } else { %>
<span class="badge" style="background:#cf222e;">NOT LOADED</span>
<span class="meta">damo-manager.jar 미배포</span>
<% } %>
</div>
<form method="post" action="<%= request.getContextPath() %>/damo.jsp">
<div class="row">
<div>
<label for="op">동작</label>
<select id="op" name="op">
<option value="encrypt" <%= "encrypt".equals(op) ? "selected" : "" %>>encrypt (암호화)</option>
<option value="decrypt" <%= "decrypt".equals(op) ? "selected" : "" %>>decrypt (복호화)</option>
<option value="sha256" <%= "sha256".equals(op) ? "selected" : "" %>>hash SHA-256</option>
<option value="sha512" <%= "sha512".equals(op) ? "selected" : "" %>>hash SHA-512</option>
</select>
</div>
</div>
<label for="input">입력</label>
<textarea id="input" name="input" placeholder="암호화/복호화/해시할 문자열"><%= esc(input) %></textarea>
<input type="hidden" name="run" value="1">
<button type="submit">실행</button>
</form>
<% if (run || error.length() > 0) { %>
<div class="result">
<label>결과<% if (run && error.length() == 0) { %> <span class="meta">(<%= esc(op) %>)</span><% } %></label>
<div class="out <%= error.length() > 0 ? "err" : "" %>"><%= error.length() > 0 ? esc(error) : esc(result) %></div>
</div>
<% } %>
<div class="hint">
모드 의미 — <b>BYPASS</b>: 무변환 원문 통과(<b>기본값</b>, 옵션 없음) · <b>FAKE</b>: Base64/JRE 해시(<code>-Ddamo-manager.enabled=true</code>, scpdb 없음) · <b>REAL</b>: penta scpdb 실 암복호화(<code>enabled=true</code> + scpdb).<br>
BYPASS 모드에서는 encrypt/decrypt/hash 모두 입력을 그대로 반환합니다.<br>
운영은 <code>-Ddamo-manager.require-real=true</code> 로 real 강제(아니면 기동 실패). CLI 로도 동일 확인: <code>java -jar damo-manager.jar enc &lt;text&gt;</code>
</div>
</div>
</body>
</html>
+1
View File
@@ -1,6 +1,7 @@
<%@ page language="java" contentType="text/html; charset=utf-8"%> <%@ page language="java" contentType="text/html; charset=utf-8"%>
<%@page import="org.apache.commons.lang3.StringUtils"%> <%@page import="org.apache.commons.lang3.StringUtils"%>
<%@page import="com.eactive.eai.rms.common.login.SessionManager"%> <%@page import="com.eactive.eai.rms.common.login.SessionManager"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,334 @@
/**
* Editor Content Styles (editor-content.css)
*
* Summernote 에디터로 작성된 HTML 콘텐츠의 공통 스타일
* 관리자포탈/개발자포탈 양쪽에서 동일하게 사용
*
* 사용법:
* - 관리자포탈: Summernote .note-editable에 .editor-content 클래스 추가
* - 개발자포탈: 콘텐츠 wrapper에 .editor-content 클래스 추가
*
* @version 1.0.0
* @date 2025-12-30
*/
/* ==========================================================================
CSS Reset + 기본 설정
========================================================================== */
.editor-content {
all: revert;
font-family: 'Noto Sans KR', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif !important;
font-size: 16px !important;
font-weight: 400 !important;
line-height: 1.8 !important;
color: #1A1A2E !important;
word-wrap: break-word;
text-align: left !important;
}
/* ==========================================================================
헤딩 (Headings)
========================================================================== */
.editor-content h1 {
font-size: 20px !important;
font-weight: 700 !important;
margin: 32px 0 16px !important;
line-height: 1.4 !important;
color: #1A1A2E !important;
}
.editor-content h1:first-child {
margin-top: 0 !important;
}
.editor-content h2 {
font-size: 18px !important;
font-weight: 700 !important;
margin: 24px 0 8px !important;
line-height: 1.4 !important;
color: #1A1A2E !important;
}
.editor-content h3 {
font-size: 16px !important;
font-weight: 600 !important;
margin: 16px 0 8px !important;
line-height: 1.4 !important;
color: #1A1A2E !important;
}
.editor-content h4,
.editor-content h5,
.editor-content h6 {
font-size: 16px !important;
font-weight: 600 !important;
margin: 16px 0 8px !important;
line-height: 1.4 !important;
color: #1A1A2E !important;
}
/* ==========================================================================
단락 (Paragraphs)
========================================================================== */
.editor-content p {
margin-bottom: 16px !important;
line-height: 1.8 !important;
font-size: 16px !important;
}
.editor-content p:last-child {
margin-bottom: 0 !important;
}
/* ==========================================================================
리스트 (Lists) - 글로벌 reset 대응
========================================================================== */
.editor-content ul {
list-style-type: disc !important;
padding-left: 32px !important;
margin: 16px 0 !important;
}
.editor-content ol {
list-style-type: decimal !important;
padding-left: 32px !important;
margin: 16px 0 !important;
}
.editor-content li {
margin-bottom: 8px !important;
line-height: 1.8 !important;
font-size: 16px !important;
}
.editor-content li:last-child {
margin-bottom: 0 !important;
}
/* 중첩 리스트 */
.editor-content ul ul {
list-style-type: circle !important;
margin: 8px 0 !important;
}
.editor-content ul ul ul {
list-style-type: square !important;
}
.editor-content ol ol {
list-style-type: lower-alpha !important;
margin: 8px 0 !important;
}
.editor-content ol ol ol {
list-style-type: lower-roman !important;
}
/* ==========================================================================
테이블 (Tables)
========================================================================== */
.editor-content table {
width: 100% !important;
border-collapse: collapse !important;
margin: 24px 0 !important;
border: 1px solid #E2E8F0 !important;
border-radius: 8px !important;
overflow: hidden !important;
font-size: 14px !important;
}
.editor-content th,
.editor-content td {
border: 1px solid #E2E8F0 !important;
padding: 8px 16px !important;
text-align: left !important;
vertical-align: top !important;
}
.editor-content th {
background: #EFF6FF !important;
font-weight: 600 !important;
color: #1A1A2E !important;
}
.editor-content tr:hover {
background: #F8FAFC !important;
}
/* ==========================================================================
링크 (Links)
========================================================================== */
.editor-content a {
color: #0049b4 !important;
text-decoration: underline !important;
transition: color 0.3s ease !important;
}
.editor-content a:hover {
color: #003080 !important;
}
/* ==========================================================================
인용문 (Blockquote)
========================================================================== */
.editor-content blockquote {
border-left: 4px solid #0049b4 !important;
padding: 16px 24px !important;
margin: 24px 0 !important;
background: #F8FAFC !important;
font-style: italic !important;
color: #64748B !important;
border-radius: 0 8px 8px 0 !important;
}
.editor-content blockquote p {
margin-bottom: 0 !important;
}
/* ==========================================================================
이미지 (Images)
========================================================================== */
.editor-content img {
max-width: 100% !important;
height: auto !important;
border-radius: 8px !important;
margin: 16px 0 !important;
display: block !important;
}
/* ==========================================================================
코드 (Code)
========================================================================== */
.editor-content code {
background: #F8FAFC !important;
padding: 2px 6px !important;
border-radius: 4px !important;
font-family: 'Fira Code', 'Courier New', monospace !important;
font-size: 0.9em !important;
color: #0049b4 !important;
}
.editor-content pre {
background: #F8FAFC !important;
border: 1px solid #E2E8F0 !important;
border-radius: 8px !important;
padding: 16px !important;
overflow-x: auto !important;
margin: 16px 0 !important;
}
.editor-content pre code {
background: transparent !important;
padding: 0 !important;
color: #1A1A2E !important;
}
/* ==========================================================================
구분선 (Horizontal Rule)
========================================================================== */
.editor-content hr {
border: none !important;
border-top: 1px solid #E2E8F0 !important;
margin: 32px 0 !important;
}
/* ==========================================================================
텍스트 강조 (Text Emphasis)
========================================================================== */
.editor-content strong,
.editor-content b {
font-weight: 700 !important;
}
.editor-content em,
.editor-content i {
font-style: italic !important;
}
.editor-content u {
text-decoration: underline !important;
}
.editor-content s,
.editor-content strike,
.editor-content del {
text-decoration: line-through !important;
}
.editor-content mark {
background-color: #FEF3C7 !important;
padding: 0 2px !important;
}
.editor-content sub {
vertical-align: sub !important;
font-size: 0.8em !important;
}
.editor-content sup {
vertical-align: super !important;
font-size: 0.8em !important;
}
/* ==========================================================================
반응형 (Responsive)
========================================================================== */
@media (max-width: 768px) {
.editor-content {
font-size: 14px !important;
}
.editor-content h1 {
font-size: 18px !important;
}
.editor-content h2 {
font-size: 16px !important;
}
.editor-content h3,
.editor-content h4,
.editor-content h5,
.editor-content h6 {
font-size: 14px !important;
}
.editor-content p,
.editor-content li {
font-size: 14px !important;
}
.editor-content table {
font-size: 12px !important;
}
.editor-content th,
.editor-content td {
padding: 4px 8px !important;
}
.editor-content ul,
.editor-content ol {
padding-left: 24px !important;
}
.editor-content blockquote {
padding: 8px 16px !important;
}
.editor-content pre {
padding: 8px !important;
}
}
+310
View File
@@ -0,0 +1,310 @@
// 계좌이체 API 모의 데이터
// locked: true 인 필드는 게이트웨이가 자동 주입한 값(회색 + 자물쇠)
// locked: false / 미지정 인 필드는 사용자가 자유롭게 편집
window.SAMPLE_DATA = (function () {
return {
info: {
title: { value: '계좌이체 API', locked: false },
version: { value: '1.0.0', locked: false },
summary: { value: '', locked: false },
description: { value: '', locked: false },
termsOfService: { value: '', locked: false },
contact: {
name: { value: 'DJB API Team', locked: false },
email: { value: 'api@djb.co.kr', locked: false },
url: { value: '', locked: false }
},
license: {
name: { value: '', locked: false },
url: { value: '', locked: false }
}
},
tags: [
{ name: 'transfer', description: '계좌이체 관련 API' }
],
externalDocs: {
description: { value: '', locked: false },
url: { value: '', locked: false }
},
servers: [
{
url: { value: 'https://api-dev.djb.co.kr', locked: true },
env: 'development',
description: { value: '개발 환경', locked: false }
},
{
url: { value: 'https://api-stg.djb.co.kr', locked: true },
env: 'staging',
description: { value: '스테이징 환경', locked: false }
},
{
url: { value: 'https://api.djb.co.kr', locked: true },
env: 'production',
description: { value: '운영 환경', locked: false }
}
],
serverVariables: [
{
name: { value: 'basePath', locked: true },
default: { value: '/v1', locked: false },
enumStr: { value: '/v1,/v2', locked: false },
description: { value: 'API 버전 경로', locked: false }
}
],
operation: {
method: { value: 'POST', locked: true },
path: { value: '/v1/accounts/transfer', locked: true },
operationId: { value: 'transferAccount', locked: false },
summary: { value: '', locked: false },
description: { value: '', locked: false },
tags: { value: ['transfer'], locked: false },
deprecated: { value: false, locked: false }
},
// 파라미터 (Path/Query/Header/Cookie)
parameters: [
{
in: 'header',
name: { value: 'X-Request-Id', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: 'uuid', locked: false },
maxLength: { value: '', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '', locked: false }
}
],
// Request Body 스키마 (중첩 3단)
requestBody: {
mediaType: 'application/json',
required: { value: true, locked: true },
schema: [
{
name: { value: 'transactionId', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '40', locked: false },
pattern: { value: '^tx-[0-9a-zA-Z-]+$', locked: false },
description: { value: '', locked: false },
example: { value: 'tx-20260522-001', locked: false },
children: null
},
{
name: { value: 'sender', locked: true },
type: { value: 'object', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '', locked: false },
pattern: { value: '', locked: false },
description: { value: '송금인 정보', locked: false },
example: { value: '', locked: false },
children: [
{
name: { value: 'accountNumber', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '20', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '110-1234-567890', locked: false },
children: null
},
{
name: { value: 'bankCode', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '3', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '088', locked: false },
children: null
},
{
name: { value: 'holderName', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '60', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '김철수', locked: false },
children: null
}
]
},
{
name: { value: 'receiver', locked: true },
type: { value: 'object', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '', locked: false },
pattern: { value: '', locked: false },
description: { value: '수취인 정보', locked: false },
example: { value: '', locked: false },
children: [
{
name: { value: 'accountNumber', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '20', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '111-2345-678901', locked: false },
children: null
},
{
name: { value: 'bankCode', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '3', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '020', locked: false },
children: null
},
{
name: { value: 'holderName', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '60', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '이영희', locked: false },
children: null
}
]
},
{
name: { value: 'amount', locked: true },
type: { value: 'object', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '', locked: false },
pattern: { value: '', locked: false },
description: { value: '이체 금액', locked: false },
example: { value: '', locked: false },
children: [
{
name: { value: 'value', locked: true },
type: { value: 'integer', locked: true },
required: { value: true, locked: true },
format: { value: 'int64', locked: false },
maxLength: { value: '', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '50000', locked: false },
children: null
},
{
name: { value: 'currency', locked: true },
type: { value: 'string', locked: true },
required: { value: true, locked: true },
format: { value: '', locked: false },
maxLength: { value: '3', locked: false },
pattern: { value: '^[A-Z]{3}$', locked: false },
description: { value: 'ISO 4217 통화코드', locked: false },
example: { value: 'KRW', locked: false },
children: null
}
]
},
{
name: { value: 'memo', locked: true },
type: { value: 'string', locked: true },
required: { value: false, locked: true },
format: { value: '', locked: false },
maxLength: { value: '100', locked: false },
pattern: { value: '', locked: false },
description: { value: '', locked: false },
example: { value: '5월 회비', locked: false },
children: null
}
]
},
// 응답 스키마 (상태코드 별)
responses: {
'200': {
description: { value: '이체 성공', locked: false },
schema: [
{ name: { value: 'transactionId', locked: true }, type: { value: 'string', locked: true }, required: { value: true, locked: true }, format: { value: '', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: 'tx-20260522-001', locked: false }, children: null },
{ name: { value: 'status', locked: true }, type: { value: 'string', locked: true }, required: { value: true, locked: true }, format: { value: '', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: 'COMPLETED', locked: false }, children: null },
{ name: { value: 'completedAt', locked: true }, type: { value: 'string', locked: true }, required: { value: true, locked: true }, format: { value: 'date-time', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: '2026-05-22T10:00:00Z', locked: false }, children: null },
{
name: { value: 'balance', locked: true }, type: { value: 'object', locked: true }, required: { value: true, locked: true }, format: { value: '', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '잔액 정보', locked: false }, example: { value: '', locked: false },
children: [
{ name: { value: 'before', locked: true }, type: { value: 'integer', locked: true }, required: { value: true, locked: true }, format: { value: 'int64', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: '1000000', locked: false }, children: null },
{ name: { value: 'after', locked: true }, type: { value: 'integer', locked: true }, required: { value: true, locked: true }, format: { value: 'int64', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: '950000', locked: false }, children: null }
]
}
]
},
'400': {
description: { value: '잘못된 요청', locked: false },
schema: [
{
name: { value: 'error', locked: true }, type: { value: 'object', locked: true }, required: { value: true, locked: true }, format: { value: '', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: '', locked: false },
children: [
{ name: { value: 'code', locked: true }, type: { value: 'string', locked: true }, required: { value: true, locked: true }, format: { value: '', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: 'INVALID_AMOUNT', locked: false }, children: null },
{ name: { value: 'message', locked: true }, type: { value: 'string', locked: true }, required: { value: true, locked: true }, format: { value: '', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: '금액이 올바르지 않습니다', locked: false }, children: null },
{ name: { value: 'details', locked: true }, type: { value: 'array', locked: true }, required: { value: false, locked: true }, format: { value: '', locked: false }, maxLength: { value: '', locked: false }, pattern: { value: '', locked: false }, description: { value: '', locked: false }, example: { value: '', locked: false }, itemsType: { value: 'string', locked: false }, children: null }
]
}
]
},
'401': { description: { value: '인증 실패', locked: false }, schema: [] },
'500': { description: { value: '서버 오류', locked: false }, schema: [] }
},
// 보안 스킴
securitySchemes: [
{
key: 'ApiKeyAuth',
type: 'apiKey',
locked: true,
name: { value: 'X-API-Key', locked: true },
in: { value: 'header', locked: true },
description: { value: '', locked: false }
}
],
globalSecurity: ['ApiKeyAuth'],
// 예제
examples: {
request: {
'application/json': {
default: '{\n "transactionId": "tx-20260522-001",\n "sender": {\n "accountNumber": "110-1234-567890",\n "bankCode": "088",\n "holderName": "김철수"\n },\n "receiver": {\n "accountNumber": "111-2345-678901",\n "bankCode": "020",\n "holderName": "이영희"\n },\n "amount": {\n "value": 50000,\n "currency": "KRW"\n },\n "memo": "5월 회비"\n}'
}
},
response: {
'200': { body: '{\n "transactionId": "tx-20260522-001",\n "status": "COMPLETED"\n}', headers: [ { name: 'X-RateLimit-Remaining', type: 'integer', description: '남은 요청 횟수', example: '99' } ] }
}
},
// 문서 옵션
docOptions: {
theme: 'light',
lang: 'ko',
includeExamples: true,
tryItOut: true,
defaultExpandDepth: -1,
layout: 'BaseLayout',
tagFilter: [],
sideToc: true
}
};
})();
+103
View File
@@ -0,0 +1,103 @@
/* DJB OpenAPI Editor POC — Tailwind 보강 커스텀 */
html, body {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Apple SD Gothic Neo",
"Malgun Gothic", "Noto Sans KR", system-ui, sans-serif;
}
/* === 잠금 행/카드 좌측 띠 === */
.locked-row td:first-child {
position: relative;
}
.locked-row td:first-child::before {
content: '';
position: absolute;
left: 0;
top: 6px;
bottom: 6px;
width: 3px;
background: #cbd5e1;
border-radius: 2px;
}
.locked-card {
position: relative;
background: linear-gradient(to right, #f8fafc 0%, #ffffff 4px) #ffffff;
}
.locked-card::before {
content: '';
position: absolute;
left: 0; top: 8px; bottom: 8px;
width: 3px;
background: #cbd5e1;
border-radius: 0 2px 2px 0;
}
/* === 스키마 테이블 — 가독성 보조 === */
.schema-table th { white-space: nowrap; }
.schema-table tbody tr:hover { background: #fafbfc; }
.schema-table input,
.schema-table select {
font-size: 12.5px;
}
.schema-table input[type="text"] {
padding-top: 4px;
padding-bottom: 4px;
}
/* === 스텝퍼 항목 hover === */
.step-item:hover { background: #f8fafc; }
/* === 미리보기 패널: Swagger UI 크기 미세조정 === */
#preview-swagger .swagger-ui {
font-size: 13px;
}
#preview-swagger .swagger-ui .info { margin: 18px 0; }
#preview-swagger .swagger-ui .info .title { font-size: 22px; }
#preview-swagger .swagger-ui .scheme-container { padding: 12px 0; box-shadow: none; }
#preview-swagger .swagger-ui .opblock { margin: 0 0 12px 0; }
/* === 다크 테마 (POC 시뮬레이션 — Swagger 자체 다크는 미지원이라 컨테이너만) === */
body.theme-dark #preview-swagger { background: #1e293b; }
/* === 토스트 애니메이션 === */
#toast { transition: opacity 0.2s; }
/* === Monaco 컨테이너가 hidden 일 때 layout 깨짐 방지 === */
#preview-monaco {
overflow: hidden;
}
/* === Stepper 6단 grid 셀 좌우 라인 (마지막 셀 제외) === */
#stepper li {
position: relative;
}
#stepper li:not(:last-child)::after {
content: '';
position: absolute;
top: 50%;
right: -8px;
width: 16px;
height: 1px;
background: #e2e8f0;
}
/* === 보안 스킴 카드 — 잠금 표시 === */
.locked-card {
background: #fafbfc;
}
/* === 칩(태그) 미세 조정 === */
.tag-chip { transition: background 0.15s; }
/* === Export menu fade === */
#export-menu { animation: fadeIn 0.12s ease-out; }
@keyframes fadeIn {
from { opacity: 0; transform: translateY(-4px); }
to { opacity: 1; transform: translateY(0); }
}
/* === 1600px 기준 폼 패널 내부 가로 여유 확보 === */
#form-content { max-width: 100%; }
/* === readonly input 위에서 텍스트 커서 안 보이게 === */
input[readonly] { user-select: text; }
+2 -2
View File
@@ -353,10 +353,10 @@
</div> </div>
<!-- SSO 로그인 버튼 (비상모드 시 숨김) --> <!-- SSO 로그인 버튼 (비상모드 시 숨김) -->
<c:if test="${not emergencyMode}"> <c:if test="${not emergencyMode}">
<div class="form-group"> <!-- <div class="form-group">
<input type="button" id="btn_sso_login" class="form-control btn btn-success rounded submit px-3" <input type="button" id="btn_sso_login" class="form-control btn btn-success rounded submit px-3"
value="SSO Login"> value="SSO Login">
</div> </div> -->
</c:if> </c:if>
<p style="color:red;"><%=resultMsg %></p> <p style="color:red;"><%=resultMsg %></p>
</form> </form>
+17 -7
View File
@@ -52,6 +52,13 @@
var urlParam = window.document.location.search; var urlParam = window.document.location.search;
var mod = ""; var mod = "";
var strServiceType = "<%=request.getParameter("serviceType")%>"; var strServiceType = "<%=request.getParameter("serviceType")%>";
function getServiceType() {
var serviceType = sessionStorage.getItem("serviceType");
if (!serviceType || serviceType == "undefined" || serviceType == "null") {
serviceType = localStorage.getItem("serviceType") || "";
}
return serviceType;
}
if(urlParam != ""){ if(urlParam != ""){
if(urlParam.indexOf("mod=") > -1){ if(urlParam.indexOf("mod=") > -1){
mod = urlParam.substring((urlParam.indexOf("mod=") + 4), urlParam.lastIndexOf("&")); mod = urlParam.substring((urlParam.indexOf("mod=") + 4), urlParam.lastIndexOf("&"));
@@ -67,15 +74,18 @@
} }
} }
$(document).ready(function() { $(document).ready(function() {
var url = '<%=topPage%>'; var url = '<%=topPage%>';
if (url.indexOf("?")>=0){ var serviceType = getServiceType();
url = url + "&serviceType="+ sessionStorage["serviceType"]; if (serviceType) {
}else{ if (url.indexOf("?")>=0){
url = url + "?serviceType="+ sessionStorage["serviceType"]; url = url + "&serviceType="+ serviceType;
}else{
url = url + "?serviceType="+ serviceType;
}
} }
$("#topFrame").attr('src',url); $("#topFrame").attr('src',url);
$(".topMenu").load(function(){ // iframe이 모두 load된후 제어 $(".topMenu").load(function(){ // iframe이 모두 load된후 제어
$(".topMenu").contents().find('.gnb').on("mouseenter", function(e){ $(".topMenu").contents().find('.gnb').on("mouseenter", function(e){
+2 -2
View File
@@ -551,9 +551,9 @@
</h1><!-- /monitoring/images/top_logo.png --> </h1><!-- /monitoring/images/top_logo.png -->
<div class="topmenu_box"> <div class="topmenu_box">
<ul> <ul>
<li style="width:240px;" id="newDashboardShow"> <li style="width:240px;" id="newDashboardShow">
<a style="width:240px;" <a style="width:240px;"
href="#"><span><%=SessionManager.getUserName(request) %>(<%=SessionManager.getUserId(request) %>)</span> href="#"><span><%=SessionManager.getUserName(request) %>(<%=SessionManager.getUserId(request) %>-<%=System.getProperty("inst.Name") %>)</span>
<span onClick="javascript:openColorPopup();"><%=localeMessage.getString("screen.customer") %></span> <span onClick="javascript:openColorPopup();"><%=localeMessage.getString("screen.customer") %></span>
<% if (!"".equals(LastLoginYms.trim())) { %> <% if (!"".equals(LastLoginYms.trim())) { %>
<span style="display:block;font-size:10px;"><%=localeMessage.getString("screen.lastLogin") %> : <%=LastLoginYms%> [ <%=LastLoginIp%> ]</span> <span style="display:block;font-size:10px;"><%=localeMessage.getString("screen.lastLogin") %> : <%=LastLoginYms%> [ <%=LastLoginIp%> ]</span>
+40 -23
View File
@@ -1,5 +1,10 @@
/** /**
* 문자열 마스킹 처리를 위한 유틸리티 * 문자열 마스킹 처리를 위한 유틸리티
*
* 보안아키텍처 표준 마스킹 규칙(Java MaskingUtils)과 동일한 결과를 내도록 구현한다.
* 이름 2자: 뒤 1자리(가나→가*) / 3자 이상: 앞뒤 제외 가운데 전체(가나다라→가**라)
* 이메일 아이디 앞2·뒤2 마스킹, 4자 이하 전체(test→****, test123→**st1**)
* 전화 2·3번째 세그먼트 각각 뒤 2자리(010-1234-1234→010-12**-12**)
*/ */
const StringMaskingUtil = { const StringMaskingUtil = {
@@ -8,41 +13,51 @@ const StringMaskingUtil = {
return str != null && str !== ''; return str != null && str !== '';
}, },
// 이름 마스킹 처리 // '*' 반복 생성
_stars: function(count) {
return count > 0 ? '*'.repeat(count) : '';
},
// 세그먼트 뒤 count 자리 마스킹
_maskSegmentTail: function(segment, count) {
if (segment.length <= count) {
return this._stars(segment.length);
}
return segment.substring(0, segment.length - count) + this._stars(count);
},
// 이름 마스킹 처리 (2자: 뒤 1자리, 3자 이상: 앞뒤 제외 가운데 전체)
maskName: function(name) { maskName: function(name) {
if (!this.isValidString(name)) { if (!this.isValidString(name)) {
return name; return name;
} }
return name.length > 1 ? const len = name.length;
name.substring(0, name.length - 1) + "*" : if (len === 1) {
name; return name;
}
if (len === 2) {
return name.charAt(0) + '*';
}
return name.charAt(0) + this._stars(len - 2) + name.charAt(len - 1);
}, },
// 이메일 마스킹 처리 // 이메일 마스킹 처리 (아이디 앞2·뒤2, 4자 이하 전체)
maskEmail: function(email) { maskEmail: function(email) {
if (!this.isValidString(email) || !email.includes('@')) { if (!this.isValidString(email) || !email.includes('@')) {
return email; return email;
} }
const parts = email.split('@'); const atIdx = email.indexOf('@');
if (parts.length !== 2) { const local = email.substring(0, atIdx);
return email; const domain = email.substring(atIdx);
if (local.length <= 4) {
return this._stars(local.length) + domain;
} }
return this._stars(2) + local.substring(2, local.length - 2) + this._stars(2) + domain;
const localPart = parts[0];
let maskedLocal;
if (localPart.length <= 3) {
maskedLocal = localPart.substring(0, 1) +
'*'.repeat(localPart.length - 1);
} else {
maskedLocal = localPart.substring(0, localPart.length - 3) + '***';
}
return maskedLocal + '@' + parts[1];
}, },
// 휴대폰 번호 마스킹 처리 // 휴대폰/전화 번호 마스킹 처리 (2·3번째 세그먼트 각각 뒤 2자리)
maskMobileNumber: function(number) { maskMobileNumber: function(number) {
if (!this.isValidString(number)) { if (!this.isValidString(number)) {
return number; return number;
@@ -50,8 +65,10 @@ const StringMaskingUtil = {
const parts = number.split('-'); const parts = number.split('-');
if (parts.length === 3) { if (parts.length === 3) {
return parts[0] + '-****-' + parts[2]; return parts[0] + '-' +
this._maskSegmentTail(parts[1], 2) + '-' +
this._maskSegmentTail(parts[2], 2);
} }
return number; return number;
} }
}; };
@@ -250,6 +250,29 @@ var url_view = '<c:url value="/onl/admin/common/propertyMan.view" />';
}); });
}); });
$("#btn_pop_encrypt").click(function() {
var prpty2Val = $("input[name=prpty2Val]").val();
if (prpty2Val == '') {
alert("프라퍼티 값을 입력하세요");
return;
}
var postData = {
cmd : "ENCRYPT",
prpty2Val : prpty2Val,
};
$.ajax({
type : "POST",
url : url,
data : postData,
success : function(args) {
$("input[name=prpty2Val]").val(args);
},
error : function(e) {
alert(e.responseText);
}
});
});
buttonControl(key); buttonControl(key);
titleControl(key); titleControl(key);
@@ -289,12 +312,17 @@ var url_view = '<c:url value="/onl/admin/common/propertyMan.view" />';
<table class="table_row" cellspacing="0"> <table class="table_row" cellspacing="0">
<tr> <tr>
<th style="width:20%;"><%= localeMessage.getString("propertyDetail.propertyKey") %></th> <th style="width:20%;"><%= localeMessage.getString("propertyDetail.propertyKey") %></th>
<td><input type="text" name="prptyName" style="width:calc(100% - 85px);" /> <!-- <img src="<c:url value="/img/btn_pop_input.png"/>" id="btn_pop_input" /></td> --> <td>
<button type="button" class="cssbtn smallBtn2" id="btn_pop_input" style="vertical-align:middle; font-weight:bold;"><i class="material-icons">input</i><%= localeMessage.getString("button.input") %></button> <input type="text" name="prptyName" style="width:calc(100% - 85px);" /> <!-- <img src="<c:url value="/img/btn_pop_input.png"/>" id="btn_pop_input" /></td> -->
<button type="button" class="cssbtn smallBtn2" id="btn_pop_input" style="vertical-align:middle; font-weight:bold;"><i class="material-icons">input</i><%= localeMessage.getString("button.input") %></button>
</td>
</tr> </tr>
<tr> <tr>
<th><%= localeMessage.getString("propertyDetail.propertyValue") %></th> <th style="width:20%;"><%= localeMessage.getString("propertyDetail.propertyValue") %></th>
<td><input type="text" name="prpty2Val"/></td> <td>
<input type="text" name="prpty2Val" style="width:calc(100% - 85px);"/>
<button type="button" class="cssbtn smallBtn2" id="btn_pop_encrypt" style="vertical-align:middle; font-weight:bold;"><i class="material-icons">lock</i><%= localeMessage.getString("button.encode") %></button>
</td>
</tr> </tr>
</table> </table>
<!-- grid --> <!-- grid -->
@@ -34,7 +34,7 @@
, {id:'LLLVAR',name:'[ISO8583] LLLVAR'}, {id:'LLLLVAR',name:'[ISO8583] LLLLVAR'}, {id:'BINARY',name:'[ISO8583] BINARY'}, {id:'LLBIN',name:'[ISO8583] LLBIN'} , {id:'LLLVAR',name:'[ISO8583] LLLVAR'}, {id:'LLLLVAR',name:'[ISO8583] LLLLVAR'}, {id:'BINARY',name:'[ISO8583] BINARY'}, {id:'LLBIN',name:'[ISO8583] LLBIN'}
, {id:'LLLBIN',name:'[ISO8583] LLLBIN'}]; , {id:'LLLBIN',name:'[ISO8583] LLLBIN'}];
const basicDataTypes = [{id:'BigDecimal',name:'BigDecimal'},{id:'String',name:'String'}]; const basicDataTypes = [{id:'BigDecimal',name:'BigDecimal'},{id:'String',name:'String'},{id:'Boolean',name:'Boolean'}];
function gridRenderingInit() { function gridRenderingInit() {
$('#effectGrid').jqGrid({ $('#effectGrid').jqGrid({
@@ -44,14 +44,16 @@
'<%=localeMessage.getString("stdDefaultMan.columDesc")%>', '<%=localeMessage.getString("stdDefaultMan.columDesc")%>',
'<%=localeMessage.getString("stdDefaultMan.columLen")%>', '<%=localeMessage.getString("stdDefaultMan.columLen")%>',
'<%=localeMessage.getString("stdDefaultMan.keyOr")%>', '<%=localeMessage.getString("stdDefaultMan.keyOr")%>',
'<%=localeMessage.getString("stdDefaultMan.ifOr")%>' '<%=localeMessage.getString("stdDefaultMan.ifOr")%>',
'<%=localeMessage.getString("stdDefaultMan.orderSeq")%>'
], ],
colModel:[ colModel:[
{ name : 'COLUMNNAME' , align:'left' , sortable:false }, { name : 'COLUMNNAME' , align:'left' , width: '200px', sortable:false },
{ name : 'COLUMNDESC' , align:'left' }, { name : 'COLUMNDESC' , align:'left' , width: '200px' },
{ name : 'COLUMNLENGTH' , align:'right' }, { name : 'COLUMNLENGTH' , align:'center' , width: '100px' },
{ name : 'ISKEY' , align:'center' }, { name : 'ISKEY' , align:'center', width: '100px' },
{ name : 'ISINTERFACE' , align:'center' } { name : 'ISINTERFACE' , align:'center', width: '100px' },
{ name : 'ORDERSEQ' , align:'center', width: '100px' }
], ],
jsonReader: { jsonReader: {
repeatitems:false repeatitems:false
@@ -23,7 +23,7 @@
<script language="javascript" > <script language="javascript" >
var url = '<c:url value="/onl/apim/apigroup/apiGroupMan.json"/>'; var url = '<c:url value="/onl/apim/apigroup/apiGroupMan.json"/>';
var url_view = '<c:url value="/onl/apim/apigroup/apiGroupMan.view"/>'; var url_view = '<c:url value="/onl/apim/apigroup/apiGroupMan.view"/>';
var url_popup_view = '<c:url value="/onl/transaction/apim/apiSpecManPopup.view"/>'; var url_popup_view = '<c:url value="/onl/transaction/apim/apiSpecMan.view"/>';
var isDetail = false; var isDetail = false;
let dialog; let dialog;
@@ -300,6 +300,10 @@
<div class="title">Client 정보</div> <div class="title">Client 정보</div>
<table id="client" class="table_row" cellspacing="0"> <table id="client" class="table_row" cellspacing="0">
<colgroup>
<col style="width:20%"/>
<col style="width:80%"/>
</colgroup>
<tr> <tr>
<th style="width:20%;">이름</th> <th style="width:20%;">이름</th>
<td><span id="clientName"></span></td> <td><span id="clientName"></span></td>
@@ -392,15 +392,21 @@
<div class="title">사용자 정보</div> <div class="title">사용자 정보</div>
<table class="table_row" cellspacing="0"> <table class="table_row" cellspacing="0">
<colgroup>
<col style="width:20%"/>
<col style="width:30%"/>
<col style="width:20%"/>
<col style="width:30%"/>
</colgroup>
<tr> <tr>
<th style="width:20%;">이메일 아이디</th> <th>이메일 아이디</th>
<td style="width:30%;" colspan="3"><span id="loginId"></span></td> <td colspan="3"><span id="loginId"></span></td>
</tr> </tr>
<tr> <tr>
<th style="width:20%;">이름</th> <th>이름</th>
<td style="width:30%;"><span id="userName"></span></td> <td><span id="userName"></span></td>
<th style="width:20%;">권한</th> <th>권한</th>
<td style="width:30%;"><span id="roleCodeDescription"></span></td> <td><span id="roleCodeDescription"></span></td>
</tr> </tr>
<tr> <tr>
<th>핸드폰 번호</th> <th>핸드폰 번호</th>
@@ -0,0 +1,213 @@
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@ page import="java.io.*" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
<%@ include file="/jsp/common/include/localemessage.jsp" %>
<%
response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache");
response.setHeader("Expires", "0");
%>
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<jsp:include page="/jsp/common/include/css.jsp"/>
<jsp:include page="/jsp/common/include/script.jsp"/>
<style>
.mask-email { color:#1a73e8; font-weight:bold; }
.mask-phone { color:#d93025; font-weight:bold; }
.mask-digits { color:#9334e6; font-weight:bold; }
.msg-cell { display:inline-block; max-width:380px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; vertical-align:middle; }
</style>
<script language="javascript">
var url = '<c:url value="/onl/apim/messagerequest/messageRequestMan.json" />';
var url_view = '<c:url value="/onl/apim/messagerequest/messageRequestMan.view" />';
function escapeHtmlJs(s) { return $('<div>').text(s == null ? '' : s).html(); }
function escapeAttr(s) { return escapeHtmlJs(s).replace(/"/g, '&quot;'); }
// 제목: 없으면 messageCode, 마우스오버에 코드명(코드) 표기
function formatSubject(cellvalue, options, rowObject) {
var code = rowObject.messageCode || '';
var subject = (cellvalue && cellvalue !== '') ? cellvalue : '';
var title = rowObject.messageCodeName ? (rowObject.messageCodeName + ' (' + code + ')') : code;
if (subject) {
// 제목이 있으면 2줄: 제목 + 하단에 메세지코드
var codeLine = code ? '<br><span style="color:#888;font-size:0.85em;">' + escapeHtmlJs(code) + '</span>' : '';
return '<span title="' + escapeAttr(title) + '">' + escapeHtmlJs(subject) + codeLine + '</span>';
}
// 제목이 없으면 메세지코드만
return '<span title="' + escapeAttr(title) + '">' + escapeHtmlJs(code) + '</span>';
}
// 본문: 서버에서 마스킹+escape 된 안전 HTML 그대로 렌더
function formatMessage(cellvalue, options, rowObject) {
return '<span class="msg-cell">' + (rowObject.messageHtml || '') + '</span>';
}
// 수신자 정보: 휴대폰 / 이메일 / 메신저ID (모두 마스킹됨)
function formatReceiverInfo(cellvalue, options, rowObject) {
var parts = [];
if (rowObject.phone) parts.push(escapeHtmlJs(rowObject.phone));
if (rowObject.email) parts.push(escapeHtmlJs(rowObject.email));
if (rowObject.messengerId) parts.push(escapeHtmlJs(rowObject.messengerId));
return parts.join('<br>');
}
function formatRequestDate(cellvalue, options, rowObject) {
return '<span title="' + escapeAttr(rowObject.requestDateFull || '') + '">' + escapeHtmlJs(rowObject.requestDateShort || '') + '</span>';
}
function formatSentDate(cellvalue, options, rowObject) {
return '<span title="' + escapeAttr(rowObject.sentDateFull || '') + '">' + escapeHtmlJs(rowObject.sentDateShort || '') + '</span>';
}
function init() {
$.ajax({
type: "POST", url: url, dataType: "json",
data: {cmd: 'LIST_INIT_COMBO'},
success: function (json) {
new makeOptions("CODE", "NAME").setObj($("select[name=searchRequestStatus]"))
.setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>")
.setData(json.statusList).rendering();
new makeOptions("CODE", "NAME").setObj($("select[name=searchMessageCode]"))
.setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>")
.setData(json.messageCodeList).rendering();
putSelectFromParam();
// 콤보 로드 후 그리드 생성 (경합 방지)
buildGrid();
},
error: function (e) { alert(e.responseText); }
});
}
function buildGrid() {
$('#grid').jqGrid({
datatype: "json", mtype: 'POST', url: url,
postData: getSearchForJqgrid("cmd", "LIST"),
colNames: ['id', 'No.', '제목', '메세지 내용', '수신자명', '수신자 정보', '유형', '상태', '요청시간', '발송시간'],
colModel: [
{name: 'id', align: 'center', key: true, hidden: true},
{name: 'rowNum', align: 'center', width: 45, sortable: false},
{name: 'subject', align: 'left', width: 160, formatter: formatSubject},
{name: 'messageHtml', align: 'left', width: 300, formatter: formatMessage},
{name: 'username', align: 'center', width: 80},
{name: 'receiverInfo', align: 'left', width: 150, formatter: formatReceiverInfo},
{name: 'messageType', align: 'center', width: 60},
{name: 'requestStatus', align: 'center', width: 70},
{name: 'requestDateShort', align: 'center', width: 110, formatter: formatRequestDate},
{name: 'sentDateShort', align: 'center', width: 110, formatter: formatSentDate}
],
jsonReader: {repeatitems: false},
pager: $('#pager'),
page: '${param.page}',
rowNum: '${rmsDefaultRowNum}',
autoheight: true,
height: $("#container").height(),
autowidth: true,
viewrecords: true,
rowList: eval('[${rmsDefaultRowList}]'),
ondblClickRow: function (rowId) {
var rowData = $(this).getRowData(rowId);
var id = rowData['id'];
var url2 = url_view + '?cmd=DETAIL';
url2 += '&page=' + $(this).getGridParam("page");
url2 += '&returnUrl=' + getReturnUrl();
url2 += '&menuId=' + '${param.menuId}';
url2 += '&id=' + id;
goNav(url2);
},
loadComplete: function () {
var page = $(this).getGridParam('page');
var rowNum = $(this).getGridParam('rowNum');
var rows = $(this).getDataIDs();
var colModel = $(this).getGridParam("colModel");
for (var i = 0; i < rows.length; i++) {
var number = ((page - 1) * rowNum + i) + 1;
$(this).setCell(rows[i], 'rowNum', number);
}
// 서버 고정 정렬(요청일 역순) — 컬럼 정렬 비활성
for (var i = 0; i < colModel.length; i++) {
$(this).setColProp(colModel[i].name, {sortable: false});
}
},
loadError: function (jqXHR, textStatus, errorThrown) {
var location = '<%=request.getContextPath()%>/';
comloadError(jqXHR, textStatus, errorThrown, location);
}
});
resizeJqGridWidth('grid', 'content_middle', '1000');
}
$(document).ready(function () {
init();
$("#btn_search").click(function () {
var postData = getSearchForJqgrid("cmd", "LIST");
$("#grid").setGridParam({url: url, postData: postData, page: 1}).trigger("reloadGrid");
});
$("select[name^=search]").change(function () { $("#btn_search").click(); });
$("input[name^=search]").keydown(function (key) {
if (key.keyCode == 13) { $("#btn_search").click(); }
});
buttonControl();
});
</script>
</head>
<body>
<div class="right_box">
<div class="content_top">
<ul class="path"><li><a href="#">${rmsMenuPath}</a></li></ul>
</div><!-- end content_top -->
<div class="content_middle" id="content_middle">
<div class="search_wrap">
<button type="button" class="cssbtn" id="btn_search" level="R"><i class="material-icons">search</i> <%= localeMessage.getString("button.search") %></button>
</div>
<div class="title">메세지 발송 내역<span class="tooltip">발송 요청 이력을 조회합니다. 개인정보는 마스킹되어 표시됩니다.</span></div>
<form id="ajaxForm" onsubmit="return false;">
<table class="search_condition" cellspacing=0;>
<colgroup>
<col style="width:120px;"><col style="width:200px;">
<col style="width:120px;"><col style="width:200px;">
<col style="width:120px;"><col style="width:200px;">
</colgroup>
<tbody>
<tr>
<th>상태</th>
<td><div class="select-style"><select name="searchRequestStatus"></select></div></td>
<th>메세지 코드</th>
<td><div class="select-style"><select name="searchMessageCode"></select></div></td>
<th>수신자명</th>
<td><input type="text" name="searchRecipient" autocomplete="off"></td>
</tr>
<tr>
<th>유형</th>
<td>
<div class="select-style">
<select name="searchMessageType">
<option value="">전체</option>
<option value="EMAIL">EMAIL</option>
<option value="SMS">SMS</option>
<option value="KAKAO">KAKAO</option>
<option value="MESSENGER">MESSENGER</option>
</select>
</div>
</td>
<th>요청기간</th>
<td colspan="3">
<input type="date" name="searchFromDate"> ~ <input type="date" name="searchToDate">
</td>
</tr>
</tbody>
</table>
</form>
<table id="grid"></table>
<div id="pager"></div>
</div><!-- end content_middle -->
</div><!-- end right_box -->
</body>
</html>
@@ -0,0 +1,149 @@
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@ page import="java.io.*" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
<%@ include file="/jsp/common/include/localemessage.jsp" %>
<%
response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache");
response.setHeader("Expires", "0");
%>
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<jsp:include page="/jsp/common/include/css.jsp"/>
<jsp:include page="/jsp/common/include/script.jsp"/>
<style>
.mask-email { color:#1a73e8; font-weight:bold; }
.mask-phone { color:#d93025; font-weight:bold; }
.mask-digits { color:#9334e6; font-weight:bold; }
.msg-detail { white-space:pre-wrap; word-break:break-all; min-height:80px; line-height:1.6; }
</style>
<script language="javascript">
var url = '<c:url value="/onl/apim/messagerequest/messageRequestMan.json" />';
var url_view = '<c:url value="/onl/apim/messagerequest/messageRequestMan.view" />';
var key = '${param.id}';
function detail() {
if (!key) return;
$.ajax({
type: "POST", url: url, dataType: "json",
data: {cmd: 'DETAIL', id: key},
success: function (data) {
var codeText = (data.messageCodeName || '') + (data.messageCode ? ' (' + data.messageCode + ')' : '');
$('#messageCodeName').text(codeText);
$('#subject').text((data.subject && data.subject !== '') ? data.subject : (data.messageCode || ''));
$('#messageType').text(data.messageType || '');
$('#requestStatus').text(data.requestStatus || '');
$('#username').text(data.username || '');
$('#email').text(data.email || '');
$('#phone').text(data.phone || '');
$('#messengerId').text(data.messengerId || '');
$('#umsUid').text(data.umsUid || '');
$('#eaiInterfaceId').text(data.eaiInterfaceId || '');
$('#serviceId').text(data.serviceId || '');
$('#requestDate').text(data.requestDateFull || '');
$('#sentDate').text(data.sentDateFull || '');
// 서버에서 마스킹+escape 된 안전 HTML
$('#messageHtml').html(data.messageHtml || '');
// PENDING 건만 '실패 처리' 노출 (권한 제어는 buttonControl 이 담당)
if (data.requestStatus !== 'PENDING') {
$('#btn_fail').hide();
}
},
error: function (e) { alert(e.responseText); }
});
}
$(document).ready(function () {
var returnUrl = getReturnUrlForReturn();
buttonControl();
detail();
$('#btn_fail').click(function () {
if (!confirm('이 건을 FAILED(발송 실패) 상태로 변경하시겠습니까?')) return;
$.ajax({
type: "POST", url: url, dataType: "json",
data: {cmd: 'UPDATE_STATUS', id: key},
success: function () {
alert("변경되었습니다.");
detail();
},
error: function (e) { alert(e.responseText); }
});
});
$('#btn_previous').click(function () { goNav(returnUrl); });
});
</script>
</head>
<body>
<div class="right_box">
<div class="content_top">
<ul class="path"><li><a href="#">${rmsMenuPath}</a></li></ul>
</div>
<div class="content_middle">
<div class="search_wrap">
<button type="button" class="cssbtn" id="btn_fail" level="W" status="DETAIL" style="background-color:#dc3545;border-color:#dc3545;color:#fff;"><i class="material-icons">report</i> 실패 처리</button>
<button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button>
</div>
<div class="title" id="title">메세지 발송 내역 상세<span class="tooltip">개인정보는 마스킹되어 표시됩니다.</span></div>
<table class="table_row" cellspacing="0">
<colgroup>
<col style="width:12%"/><col style="width:38%"/>
<col style="width:12%"/><col style="width:38%"/>
</colgroup>
<tr>
<th>메세지 코드</th>
<td colspan="3"><span id="messageCodeName"></span></td>
</tr>
<tr>
<th>제목</th>
<td colspan="3"><span id="subject"></span></td>
</tr>
<tr>
<th>유형</th>
<td><span id="messageType"></span></td>
<th>상태</th>
<td><span id="requestStatus"></span></td>
</tr>
<tr>
<th>수신자명</th>
<td><span id="username"></span></td>
<th>메신저 ID</th>
<td><span id="messengerId"></span></td>
</tr>
<tr>
<th>이메일</th>
<td><span id="email"></span></td>
<th>휴대폰</th>
<td><span id="phone"></span></td>
</tr>
<tr>
<th>요청 시간</th>
<td><span id="requestDate"></span></td>
<th>발송 시간</th>
<td><span id="sentDate"></span></td>
</tr>
<tr>
<th>EAI 인터페이스 ID</th>
<td><span id="eaiInterfaceId"></span></td>
<th>서비스 ID</th>
<td><span id="serviceId"></span></td>
</tr>
<tr>
<th>UMS UID</th>
<td colspan="3"><span id="umsUid"></span></td>
</tr>
<tr>
<th>메세지 내용</th>
<td colspan="3"><div id="messageHtml" class="msg-detail"></div></td>
</tr>
</table>
</div>
</div>
</body>
</html>
@@ -208,6 +208,7 @@
<option value="">전체</option> <option value="">전체</option>
<option value="PENDING">문의중</option> <option value="PENDING">문의중</option>
<option value="RESPONDED">답변완료</option> <option value="RESPONDED">답변완료</option>
<option value="CLOSED">답변종료</option>
</select> </select>
</div> </div>
</td> </td>
@@ -20,7 +20,9 @@
var combo; var combo;
function formatNoticeType(cellvalue, options, rowObject) { function formatNoticeType(cellvalue, options, rowObject) {
var name = ""; if (!combo || !combo.noticeTypeList) {
return cellvalue;
}
for (var i = 0; i < combo.noticeTypeList.length; i++) { for (var i = 0; i < combo.noticeTypeList.length; i++) {
if (combo.noticeTypeList[i].CODE == cellvalue) { if (combo.noticeTypeList[i].CODE == cellvalue) {
return combo.noticeTypeList[i].NAME; return combo.noticeTypeList[i].NAME;
@@ -46,8 +48,39 @@
var icon = rowObject.hasAttachment ? '<img src="' + iconPath + '" alt="File Attached" style="vertical-align: middle; margin-left: 5px; width: 16px; height: 16px;">' : ''; var icon = rowObject.hasAttachment ? '<img src="' + iconPath + '" alt="File Attached" style="vertical-align: middle; margin-left: 5px; width: 16px; height: 16px;">' : '';
return cellvalue + icon; return cellvalue + icon;
} }
function deleteSelectedRows() {
var selectedIds = $("#grid").jqGrid('getGridParam', 'selarrrow');
if (selectedIds.length === 0) {
alert('항목을 선택하세요.');
return;
}
if (!confirm('선택된 ' + selectedIds.length + '개 항목을 삭제하시겠습니까?')) {
return;
}
$.ajax({
type: "POST",
url: url,
dataType: "json",
data: {
cmd: 'DELETE_BULK',
ids: selectedIds.join(',')
},
success: function(data) {
alert('삭제되었습니다.');
$("#grid").jqGrid('clearGridData', true);
$("#grid").trigger("reloadGrid");
},
error: function(e) {
alert('삭제 중 오류가 발생했습니다.');
}
});
}
function init(){ function init(){
$.ajax({ $.ajax({
type : "POST", type : "POST",
@@ -58,8 +91,11 @@
console.log('init', json); console.log('init', json);
combo = json; combo = json;
new makeOptions("CODE","NAME").setObj($("select[name=searchNoticeType]")).setNoValueInclude(true).setNoValue('','<%=localeMessage.getString("combo.all")%>').setData(json.noticeTypeList).rendering(); new makeOptions("CODE","NAME").setObj($("select[name=searchNoticeType]")).setNoValueInclude(true).setNoValue('','<%=localeMessage.getString("combo.all")%>').setData(json.noticeTypeList).rendering();
putSelectFromParam(); putSelectFromParam();
// 콤보(combo)가 채워진 뒤에 그리드를 생성해야 formatNoticeType 경합이 발생하지 않음
buildGrid();
}, },
error:function(e){ error:function(e){
alert(e.responseText); alert(e.responseText);
@@ -67,8 +103,8 @@
}); });
} }
$(document).ready(function() { function buildGrid(){
$('#grid').jqGrid({ $('#grid').jqGrid({
datatype:"json", datatype:"json",
mtype: 'POST', mtype: 'POST',
@@ -103,6 +139,8 @@
autowidth: true, autowidth: true,
viewrecords: true, viewrecords: true,
rowList : eval('[${rmsDefaultRowList}]'), rowList : eval('[${rmsDefaultRowList}]'),
multiselect: true,
multiboxonly: true,
ondblClickRow: function(rowId) { ondblClickRow: function(rowId) {
var rowData = $(this).getRowData(rowId); var rowData = $(this).getRowData(rowId);
var id = rowData['id']; var id = rowData['id'];
@@ -139,9 +177,13 @@
} }
}); });
init();
resizeJqGridWidth('grid','content_middle','1000'); resizeJqGridWidth('grid','content_middle','1000');
}
$(document).ready(function() {
// 콤보 로드 → 콤보 성공 콜백에서 buildGrid() 호출 (경합 방지)
init();
$("#btn_search").click(function(){ $("#btn_search").click(function(){
var postData = getSearchForJqgrid("cmd","LIST"); var postData = getSearchForJqgrid("cmd","LIST");
@@ -157,6 +199,10 @@
goNav(url2); goNav(url2);
}); });
$("#btn_delete_selected").click(function(){
deleteSelectedRows();
});
$("select[name=searchUseYn], input[name^=search]").keydown(function(key){ $("select[name=searchUseYn], input[name^=search]").keydown(function(key){
if (key.keyCode == 13){ if (key.keyCode == 13){
$("#btn_search").click(); $("#btn_search").click();
@@ -179,6 +225,7 @@
<div class="search_wrap"> <div class="search_wrap">
<button type="button" class="cssbtn" id="btn_new" level="W"><i class="material-icons">add</i> <%= localeMessage.getString("button.new") %></button> <button type="button" class="cssbtn" id="btn_new" level="W"><i class="material-icons">add</i> <%= localeMessage.getString("button.new") %></button>
<button type="button" class="cssbtn" id="btn_search" level="R"><i class="material-icons">search</i> <%= localeMessage.getString("button.search") %></button> <button type="button" class="cssbtn" id="btn_search" level="R"><i class="material-icons">search</i> <%= localeMessage.getString("button.search") %></button>
<button type="button" class="cssbtn" id="btn_delete_selected" level="W" style="background-color: #dc3545; border-color: #dc3545; color: white;"><i class="material-icons">delete_forever</i> 선택 삭제</button>
</div> </div>
<div class="title">공지사항 목록<span class="tooltip">공지사항을 관리합니다.</span></div> <div class="title">공지사항 목록<span class="tooltip">공지사항을 관리합니다.</span></div>
<form id="ajaxForm" onsubmit="return false;"> <form id="ajaxForm" onsubmit="return false;">
@@ -1,5 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ page import="java.io.*"%> <%@ page import="java.io.*"%>
<%@ page import="com.eactive.eai.rms.common.util.CommonUtil"%>
<%@ page import="com.eactive.eai.rms.common.context.MonitoringContext"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
<%@ include file="/jsp/common/include/localemessage.jsp" %> <%@ include file="/jsp/common/include/localemessage.jsp" %>
@@ -7,6 +9,9 @@
response.setHeader("Pragma", "No-cache"); response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache"); response.setHeader("Cache-Control", "no-cache");
response.setHeader("Expires", "0"); response.setHeader("Expires", "0");
MonitoringContext monitoringContext = (MonitoringContext)CommonUtil.getBean(request, "monitoringContext");
String reverseProxyUrl = monitoringContext.getStringProperty("djb.reverse_proxy.url", "");
%> %>
<%! <%!
public String getRequiredLabel(String label) { public String getRequiredLabel(String label) {
@@ -137,6 +142,7 @@
$("#compRegNo").val(formatCompanyRegNo(portalOrgData.compRegNo)); $("#compRegNo").val(formatCompanyRegNo(portalOrgData.compRegNo));
$("#corpRegNo").val(formatCorpRegNo(portalOrgData.corpRegNo)); $("#corpRegNo").val(formatCorpRegNo(portalOrgData.corpRegNo));
$("#createdDate").inputmask("9999-99-99 99:99:99", {'autoUnmask': true}); $("#createdDate").inputmask("9999-99-99 99:99:99", {'autoUnmask': true});
$("#reverseProxyPath").val(portalOrgData.reverseProxyPath);
// 전화번호 처리 // 전화번호 처리
if (portalOrgData.scPhoneNumber) { if (portalOrgData.scPhoneNumber) {
@@ -404,47 +410,6 @@
downloadFile(fileId, '1'); // fileSn은 '1'로 가정 downloadFile(fileId, '1'); // fileSn은 '1'로 가정
}); });
// OBP 파트너코드 조회 버튼 클릭
$("#btn_query_obp").click(function() {
var compRegNo = $("#compRegNo").val();
if (!compRegNo) {
jSuites.notification({ name: '알림', message: '사업자등록번호를 먼저 입력해주세요.', error: true });
$("#compRegNo").focus();
return;
}
// 하이픈 제거
compRegNo = compRegNo.replace(/-/g, '');
$.ajax({
type: "POST",
url: url,
dataType: "json",
data: {
cmd: 'QUERY_OBP_PARTNER_CODE',
compRegNo: compRegNo
},
beforeSend: function() {
$("#btn_query_obp").prop("disabled", true).html('<i class="material-icons">hourglass_empty</i> 조회중...');
},
success: function(json) {
if (json.success) {
$("#orgCode").val(json.partnerCode);
jSuites.notification({ name: '성공', message: '파트너코드가 조회되었습니다: ' + json.partnerCode });
} else {
jSuites.notification({ name: '실패', message: json.message, error: true });
}
},
error: function(e) {
jSuites.notification({ name: '오류', message: '파트너코드 조회 중 오류가 발생했습니다.', error: true });
console.error(e.responseText);
},
complete: function() {
$("#btn_query_obp").prop("disabled", false).html('<i class="material-icons">search</i> 파트너코드 조회');
}
});
});
$("#btn_modify").click(function(){ $("#btn_modify").click(function(){
if (!checkRequired("ajaxForm")) return; if (!checkRequired("ajaxForm")) return;
@@ -630,10 +595,7 @@
<tr> <tr>
<th style="width:15%;"><%= localeMessage.getString("portalOrg.orgCode") %></th> <th style="width:15%;"><%= localeMessage.getString("portalOrg.orgCode") %></th>
<td colspan="3" style="width:35%;"> <td colspan="3" style="width:35%;">
<div style="display: flex; align-items: center;"> <input type="text" name="orgCode" id="orgCode"/>
<input type="text" name="orgCode" id="orgCode" style="width: 200px; margin-right: 10px;"/>
<button type="button" class="cssbtn smallBtn" id="btn_query_obp"><i class="material-icons">search</i> 파트너코드 조회</button>
</div>
</td> </td>
<th><%= localeMessage.getString("portalOrg.orgIndustryType") %></th> <%--업종--%> <th><%= localeMessage.getString("portalOrg.orgIndustryType") %></th> <%--업종--%>
<td><input type="text" name="orgIndustryType" id="orgIndustryType" maxlength="50" /></td> <td><input type="text" name="orgIndustryType" id="orgIndustryType" maxlength="50" /></td>
@@ -738,6 +700,16 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr>
<th><%= localeMessage.getString("portalOrg.reverseProxyPath") %></th>
<td colspan="3">
<%=reverseProxyUrl %>/<input type="text" name="reverseProxyPath" id="reverseProxyPath" style="width:100px; "/>
</td>
<th></th>
<td>
</td>
</tr>
<tr><%--사업자등록증--%> <tr><%--사업자등록증--%>
<th><%= localeMessage.getString("portalOrg.compRegFile") %></th> <th><%= localeMessage.getString("portalOrg.compRegFile") %></th>
<td colspan="5" style="padding-top: 5px; padding-bottom: 5px;"> <td colspan="5" style="padding-top: 5px; padding-bottom: 5px;">
@@ -26,7 +26,38 @@ function formatFile(cellvalue, options, rowObject) {
return cellvalue + icon; return cellvalue + icon;
} }
$(document).ready(function() { function deleteSelectedRows() {
var selectedIds = $("#grid").jqGrid('getGridParam', 'selarrrow');
if (selectedIds.length === 0) {
alert('항목을 선택하세요.');
return;
}
if (!confirm('선택된 ' + selectedIds.length + '개 항목을 삭제하시겠습니까?')) {
return;
}
$.ajax({
type: "POST",
url: url,
dataType: "json",
data: {
cmd: 'DELETE_BULK',
ids: selectedIds.join(',')
},
success: function(data) {
alert('삭제되었습니다.');
$("#grid").jqGrid('clearGridData', true);
$("#grid").trigger("reloadGrid");
},
error: function(e) {
alert('삭제 중 오류가 발생했습니다.');
}
});
}
$(document).ready(function() {
$('#grid').jqGrid({ $('#grid').jqGrid({
datatype:"json", datatype:"json",
mtype: 'POST', mtype: 'POST',
@@ -45,7 +76,7 @@ $(document).ready(function() {
], ],
jsonReader: { jsonReader: {
repeatitems:false repeatitems:false
}, },
pager : $('#pager'), pager : $('#pager'),
page : '${param.page}', page : '${param.page}',
rowNum : '${rmsDefaultRowNum}', rowNum : '${rmsDefaultRowNum}',
@@ -54,6 +85,8 @@ $(document).ready(function() {
autowidth: true, autowidth: true,
viewrecords: true, viewrecords: true,
rowList : eval('[${rmsDefaultRowList}]'), rowList : eval('[${rmsDefaultRowList}]'),
multiselect: true,
multiboxonly: true,
ondblClickRow: function(rowId) { ondblClickRow: function(rowId) {
var rowData = $(this).getRowData(rowId); var rowData = $(this).getRowData(rowId);
var id = rowData['id']; var id = rowData['id'];
@@ -94,10 +127,14 @@ $(document).ready(function() {
resizeJqGridWidth('grid','content_middle','1000'); resizeJqGridWidth('grid','content_middle','1000');
$("#btn_search").click(function(){ $("#btn_search").click(function(){
var postData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로 var postData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로
$("#grid").setGridParam({ url:url,postData: postData ,page:1 }).trigger("reloadGrid"); $("#grid").setGridParam({ url:url,postData: postData ,page:1 }).trigger("reloadGrid");
}); });
$("#btn_delete_selected").click(function(){
deleteSelectedRows();
});
$("input[name^=search]").keydown(function(key){ $("input[name^=search]").keydown(function(key){
if (key.keyCode == 13){ if (key.keyCode == 13){
$("#btn_search").click(); $("#btn_search").click();
@@ -120,8 +157,9 @@ $(document).ready(function() {
<div class="content_middle" id="content_middle"> <div class="content_middle" id="content_middle">
<div class="search_wrap"> <div class="search_wrap">
<button type="button" class="cssbtn" id="btn_search" level="R" ><i class="material-icons">search</i> <%= localeMessage.getString("button.search") %></button> <button type="button" class="cssbtn" id="btn_search" level="R" ><i class="material-icons">search</i> <%= localeMessage.getString("button.search") %></button>
<button type="button" class="cssbtn" id="btn_delete_selected" level="W" style="background-color: #dc3545; border-color: #dc3545; color: white;"><i class="material-icons">delete_forever</i> 선택 삭제</button>
</div> </div>
<div class="title">사업제휴 신청 목록</div> <div class="title">피드백/개선요청 신청 목록</div>
<form id="ajaxForm" onsubmit="return false;"> <form id="ajaxForm" onsubmit="return false;">
<table class="search_condition" cellspacing=0;> <table class="search_condition" cellspacing=0;>
<tbody> <tbody>
@@ -92,6 +92,27 @@ $(document).ready(function() {
goNav(returnUrl);//LIST로 이동 goNav(returnUrl);//LIST로 이동
}); });
$("#btn_delete").click(function(){
if (!confirm('선택한 항목을 삭제하시겠습니까?')) {
return;
}
$.ajax({
type: "POST",
url: url,
dataType: "json",
data: { cmd: 'DELETE', id: key },
success: function(data) {
alert('삭제되었습니다.');
var returnUrl = getReturnUrlForReturn();
goNav(returnUrl);//LIST로 이동
},
error: function(e) {
alert('삭제 중 오류가 발생했습니다.');
}
});
});
$("#btn_unmask").click(function () { $("#btn_unmask").click(function () {
const reason = prompt("마스킹 해제 사유를 입력하세요:"); const reason = prompt("마스킹 해제 사유를 입력하세요:");
@@ -134,9 +155,10 @@ $(document).ready(function() {
<div class="content_middle"> <div class="content_middle">
<div class="search_wrap"> <div class="search_wrap">
<button type="button" class="cssbtn" id="btn_unmask" level="W" status="DETAIL"><i class="material-icons">lock_open</i> 마스킹해제</button> <button type="button" class="cssbtn" id="btn_unmask" level="W" status="DETAIL"><i class="material-icons">lock_open</i> 마스킹해제</button>
<button type="button" class="cssbtn" id="btn_delete" level="W" status="DETAIL" style="background-color: #dc3545; border-color: #dc3545; color: white;"><i class="material-icons">delete_forever</i> 삭제</button>
<button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button> <button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button>
</div> </div>
<div class="title">사업제휴 신청 상세</div> <div class="title">피드백/개선요청 신청 상세</div>
<table id="grid" ></table> <table id="grid" ></table>
<div id="pager"></div> <div id="pager"></div>
@@ -86,9 +86,11 @@
editurl: "clientArray", editurl: "clientArray",
colNames: ['<%= localeMessage.getString("propertyDetail.propertyKey") %>', colNames: ['<%= localeMessage.getString("propertyDetail.propertyKey") %>',
'<%= localeMessage.getString("propertyDetail.propertyValue") %>', '<%= localeMessage.getString("propertyDetail.propertyValue") %>',
'설명',
'<%= localeMessage.getString("propertyDetail.delYn") %>'], '<%= localeMessage.getString("propertyDetail.delYn") %>'],
colModel: [{name: 'PRPTYNAME', width: 50, align: 'left', editable: true}, colModel: [{name: 'PRPTYNAME', width: 50, align: 'left', editable: true},
{name: 'PRPTY2VAL', width: 200, align: 'left', editable: true}, {name: 'PRPTY2VAL', width: 150, align: 'left', editable: true},
{name: 'PRPTYDESC', width: 200, align: 'left', editable: true, edittype: 'textarea', editoptions: {rows: 2}},
{ {
name: 'DELETEYN', name: 'DELETEYN',
width: 20, width: 20,
@@ -258,6 +260,7 @@
var data = new Object(); var data = new Object();
data["PRPTYNAME"] = $("input[name=prptyName]").val(); data["PRPTYNAME"] = $("input[name=prptyName]").val();
data["PRPTY2VAL"] = $("input[name=prpty2Val]").val(); data["PRPTY2VAL"] = $("input[name=prpty2Val]").val();
data["PRPTYDESC"] = $("input[name=prptyDesc]").val();
var rows = $("#grid")[0].rows; var rows = $("#grid")[0].rows;
var index = Number($(rows[rows.length - 1]).attr("id")); var index = Number($(rows[rows.length - 1]).attr("id"));
@@ -340,6 +343,11 @@
<td colspan="3"><input type="text" name="prpty2Val"/> <td colspan="3"><input type="text" name="prpty2Val"/>
</td> </td>
</tr> </tr>
<tr>
<th>설명</th>
<td colspan="3"><input type="text" name="prptyDesc"/>
</td>
</tr>
</table> </table>
<!-- grid --> <!-- grid -->
<table id="grid"></table> <table id="grid"></table>
@@ -29,6 +29,16 @@
// 원본 행 데이터를 ID로 조회하기 위한 맵 // 원본 행 데이터를 ID로 조회하기 위한 맵
var gridRowDataMap = {}; var gridRowDataMap = {};
// 휴대폰번호 중복 조회 모드 여부
var isDupView = false;
// 현재 검색조건 + 중복 조회 모드 플래그를 합쳐 LIST 요청 파라미터를 생성
function buildListPostData() {
var postData = getSearchForJqgrid("cmd", "LIST");
postData.onlyDuplicateMobile = isDupView;
return postData;
}
/* 선택된 사용자 삭제 - 상태에 따라 Soft/Hard Delete 자동 분기 */ /* 선택된 사용자 삭제 - 상태에 따라 Soft/Hard Delete 자동 분기 */
function deleteSelectedUsers() { function deleteSelectedUsers() {
var selectedIds = $("#grid").jqGrid('getGridParam', 'selarrrow'); var selectedIds = $("#grid").jqGrid('getGridParam', 'selarrrow');
@@ -166,6 +176,13 @@
$('#grid').jqGrid('setColProp', 'approvalStatus', {editoptions: {value: select_approvalStatus}}); $('#grid').jqGrid('setColProp', 'approvalStatus', {editoptions: {value: select_approvalStatus}});
$('#grid').jqGrid('setColProp', 'userStatus', {editoptions: {value: select_userStatus}}); $('#grid').jqGrid('setColProp', 'userStatus', {editoptions: {value: select_userStatus}});
// 휴대폰번호 중복 허용안함(기능 ON) + 중복 사용자 존재 시 배너 노출
if (json.mobileDuplicateCheckEnabled && json.mobileDuplicateUserCount > 0) {
$("#dupMobileCount").text(json.mobileDuplicateUserCount);
$("#dupMobileBanner").show();
}
$('#grid').trigger('reloadGrid'); $('#grid').trigger('reloadGrid');
}, },
@@ -176,7 +193,7 @@
} }
$(document).ready(function () { $(document).ready(function () {
var gridPostData = getSearchForJqgrid("cmd", "LIST"); var gridPostData = buildListPostData();
$('#grid').jqGrid({ $('#grid').jqGrid({
datatype: "json", datatype: "json",
@@ -188,7 +205,7 @@
'<%= localeMessage.getString("portalUser.orgName") %>', '<%= localeMessage.getString("portalUser.orgName") %>',
'<%= localeMessage.getString("portalUser.name") %>', '<%= localeMessage.getString("portalUser.name") %>',
'<%= localeMessage.getString("portalUser.userId") %>', '<%= localeMessage.getString("portalUser.userId") %>',
<%--'<%= localeMessage.getString("portalUser.mobile") %>',--%> '<%= localeMessage.getString("portalUser.mobileNumber") %>',
'<%= localeMessage.getString("portalUser.roleName") %>', '<%= localeMessage.getString("portalUser.roleName") %>',
'<%= localeMessage.getString("portalUser.userStatus") %>', '<%= localeMessage.getString("portalUser.userStatus") %>',
'<%= localeMessage.getString("portalUser.createOn") %>', '<%= localeMessage.getString("portalUser.createOn") %>',
@@ -201,7 +218,7 @@
{name: 'portalOrgUIs.orgName', align: 'center', width: "120"}, {name: 'portalOrgUIs.orgName', align: 'center', width: "120"},
{name: 'userName', align: 'center', width: "80" }, {name: 'userName', align: 'center', width: "80" },
{name: 'loginId', align: 'center', width: "150" }, {name: 'loginId', align: 'center', width: "150" },
// {name: 'mobileNumber', align: 'center', width: "100" }, {name: 'mobileNumber', align: 'center', width: "110", hidden: true},
{name: 'roleCodeDescription', align: 'center', width: "80"}, {name: 'roleCodeDescription', align: 'center', width: "80"},
{name: 'userStatusDescription', align: 'center', width: "50"}, {name: 'userStatusDescription', align: 'center', width: "50"},
{name: 'createdDate', align: 'center', width: "100", formatter: timeStampFormat}, {name: 'createdDate', align: 'center', width: "100", formatter: timeStampFormat},
@@ -274,9 +291,20 @@
init(); init();
$("#btn_search").click(function () { $("#btn_search").click(function () {
var postData = getSearchForJqgrid("cmd", "LIST"); $("#grid").setGridParam({url: url, postData: buildListPostData(), page: 1}).trigger("reloadGrid");
});
$("#grid").setGridParam({url: url, postData: postData, page: 1}).trigger("reloadGrid"); // 중복 휴대폰번호 사용자만 보기 / 전체 보기 토글
$("#btn_dup_toggle").click(function () {
isDupView = !isDupView;
if (isDupView) {
$(this).text("전체 보기");
$("#grid").jqGrid('showCol', 'mobileNumber');
} else {
$(this).text("중복만 보기");
$("#grid").jqGrid('hideCol', 'mobileNumber');
}
$("#grid").setGridParam({url: url, postData: buildListPostData(), page: 1}).trigger("reloadGrid");
}); });
$("#btn_new").click(function () { $("#btn_new").click(function () {
@@ -334,6 +362,11 @@
</div> </div>
<% } %> <% } %>
<div id="dupMobileBanner" style="display:none; background:#f8d7da; border:1px solid #dc3545; padding:8px 15px; margin:5px 0; border-radius:4px; color:#721c24;">
<strong>&#9888; 중복 휴대폰번호 사용자 <span id="dupMobileCount">0</span>건 발견</strong>
<button type="button" class="cssbtn" id="btn_dup_toggle" style="margin-left:10px;">중복만 보기</button>
</div>
<table class="search_condition" cellspacing=0;> <table class="search_condition" cellspacing=0;>
<tbody> <tbody>
<tr> <tr>
@@ -365,15 +398,16 @@
<td><input type="text" name="searchUserName"></td> <td><input type="text" name="searchUserName"></td>
<th style="width:10%; min-width:100px;"> <th style="width:10%; min-width:100px;">
<%= localeMessage.getString("portalUser.userId") %> <%= localeMessage.getString("portalUser.userId") %><span style="color:#dc3545;">(*)</span>
</th> </th>
<td><input type="text" name="searchUserId" value="${param.searchUserId}"></td> <td><input type="text" name="searchUserId" value="${param.searchUserId}"></td>
<th style="width:10%; min-width:100px;"><%= localeMessage.getString("portalUser.mobileNumber") %> <th style="width:10%; min-width:100px;"><%= localeMessage.getString("portalUser.mobileNumber") %><span style="color:#dc3545;">(*)</span>
</th> </th>
<td><input type="text" name="searchMobileNumber" value="${param.searchMobileNumber}"></td> <td><input type="text" name="searchMobileNumber" value="${param.searchMobileNumber}"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div style="color:#dc3545; font-size:12px; margin:4px 2px;">(*) 암호화 항목 · 부분검색 불가(전체 일치)</div>
<table id="grid"></table> <table id="grid"></table>
<div id="pager"></div> <div id="pager"></div>
@@ -222,7 +222,7 @@
$("input[name=searchStartDate], input[name=searchEndDate]").datepicker(); $("input[name=searchStartDate], input[name=searchEndDate]").datepicker();
var today = getToday(); var today = getToday();
var startDate = today; var startDate = today.substring(0,6)+"01";
var endDate = today; var endDate = today;
@@ -234,6 +234,7 @@
} }
list(); list();
search();
resizeJqGridWidth('grid', 'content_middle', '1200'); resizeJqGridWidth('grid', 'content_middle', '1200');
@@ -84,6 +84,7 @@
var url ='<c:url value="/onl/transaction/apim/apiInterfaceMan.json" />'; var url ='<c:url value="/onl/transaction/apim/apiInterfaceMan.json" />';
const url_excel ='<c:url value="/onl/transaction/apim/apiInterfaceMan.excel" />'; const url_excel ='<c:url value="/onl/transaction/apim/apiInterfaceMan.excel" />';
var url_spec = '<c:url value="/onl/transaction/apim/apiSpecMan.view"/>'; var url_spec = '<c:url value="/onl/transaction/apim/apiSpecMan.view"/>';
var url_openapi_spec = '<c:url value="/onl/transaction/apim/djbApiSpecMan.view"/>';
var returnUrl ; var returnUrl ;
let headerValues = []; let headerValues = [];
let headerNames = []; let headerNames = [];
@@ -298,7 +299,7 @@
if(!isStandardMessage){ if(!isStandardMessage){
$(adapterSettings.adapterUrlId).text(adapterInfo.urlPath); $(adapterSettings.adapterUrlId).text(adapterInfo.urlPath);
} else { } else {
$(adapterSettings.methodSelectId).val(''); //$(adapterSettings.methodSelectId).val('');
$(adapterSettings.restPathInputId).val(''); $(adapterSettings.restPathInputId).val('');
$(adapterSettings.adapterUrlId).text(''); $(adapterSettings.adapterUrlId).text('');
} }
@@ -871,6 +872,10 @@
}); });
var postData = $('#ajaxForm').serializeArray(); var postData = $('#ajaxForm').serializeArray();
console.log('modify', postData);
console.log('method', $('#inboundHttpMethod').val());
if (isDetail){ if (isDetail){
postData.push({ name: "cmd" , value:"UPDATE"}); postData.push({ name: "cmd" , value:"UPDATE"});
}else{ }else{
@@ -988,6 +993,28 @@
showModal(popupUrl, args, 1200, 800); showModal(popupUrl, args, 1200, 800);
} }
// v2: OpenAPI Spec — 기본은 모달(iframe), Shift+클릭은 새 창.
// 컨텍스트는 전부 query string 으로 전달(dialogArguments 미사용).
function showOpenApiSpecPopup(e) {
var eaiSvcName = getFullSvcName();
var eaiSvcDesc = $('#eaiSvcDesc').val();
var apipath = $('#apiFullPath').val(); // METHOD|URL ('|' 포함 → 인코딩 필수)
var contentType = $('#contentType').val();
var baseUrl = url_openapi_spec
+ '?cmd=DETAIL'
+ '&eaiSvcName=' + encodeURIComponent(eaiSvcName)
+ '&apipath=' + encodeURIComponent(apipath)
+ '&eaiSvcDesc=' + encodeURIComponent(eaiSvcDesc)
+ '&contentType=' + encodeURIComponent(contentType);
if (e && e.shiftKey) {
// Shift+클릭: 새 창. window.open 은 serviceType/menuId 자동 부착 안 되므로 직접 붙임.
window.open(urlAddServiceType(baseUrl + '&menuId=' + encodeURIComponent(getMenuId())), '_blank');
} else {
// 기본: 모달 + iframe. showModal 이 serviceType/menuId/pop 을 자동 부착.
showModal(baseUrl, { title: 'OpenAPI Spec' }, 1600, 880);
}
}
$(document).ready(function() { $(document).ready(function() {
makeValidate(); makeValidate();
// var bootstrapButton = $.fn.button.noConflict() // var bootstrapButton = $.fn.button.noConflict()
@@ -1002,9 +1029,14 @@
} }
init(url,key,detail); init(url,key,detail);
// v1: 기존 API 스펙 (모달) — 기능 비교용 복원
$("#btn_api_spec").click(function() { $("#btn_api_spec").click(function() {
showApiSpecPopup(); showApiSpecPopup();
}); });
// v2: 신규 OpenAPI Spec (새 탭)
$("#btn_openapi_spec").click(function(e) {
showOpenApiSpecPopup(e);
});
$("#btn_modify").click(modifyApi); $("#btn_modify").click(modifyApi);
$("#btn_delete").click(function(){ $("#btn_delete").click(function(){
@@ -1503,7 +1535,10 @@
<button type="button" class="cssbtn" id="btn_json_export" level="R" status="DETAIL,NEW"><i class="material-icons">download</i> <%=localeMessage.getString("button.exportJson")%></button></button> <button type="button" class="cssbtn" id="btn_json_export" level="R" status="DETAIL,NEW"><i class="material-icons">download</i> <%=localeMessage.getString("button.exportJson")%></button></button>
<button type="button" class="cssbtn" id="btn_delete" level="W" status="DETAIL"><i class="material-icons">delete</i> <%= localeMessage.getString("button.delete") %></button> <button type="button" class="cssbtn" id="btn_delete" level="W" status="DETAIL"><i class="material-icons">delete</i> <%= localeMessage.getString("button.delete") %></button>
<button type="button" class="cssbtn" id="btn_modify" level="R" status="DETAIL,NEW"><i class="material-icons">save</i> <%= localeMessage.getString("button.modify") %></button> <button type="button" class="cssbtn" id="btn_modify" level="R" status="DETAIL,NEW"><i class="material-icons">save</i> <%= localeMessage.getString("button.modify") %></button>
<!-- v1: 기존 API 스펙 (모달) — 기능 비교용 복원 -->
<button type="button" class="cssbtn" id="btn_api_spec" level="R" status="DETAIL,NEW"><i class="material-icons">description</i> API 스펙</button> <button type="button" class="cssbtn" id="btn_api_spec" level="R" status="DETAIL,NEW"><i class="material-icons">description</i> API 스펙</button>
<!-- v2: 신규 OpenAPI Spec (새 탭) -->
<button type="button" class="cssbtn" id="btn_openapi_spec" level="R" status="DETAIL,NEW"><i class="material-icons">api</i> OpenAPI Spec</button>
<button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button> <button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button>
</div> </div>
<div class="title" id="title" style="font-size:1.4em">${rmsMenuName}</div> <div class="title" id="title" style="font-size:1.4em">${rmsMenuName}</div>
@@ -1686,7 +1721,7 @@
<option value="none" selected>NONE</option> <option value="none" selected>NONE</option>
<option value="oauth">OAUTH</option> <option value="oauth">OAUTH</option>
<option value="api_key">API_KEY</option> <option value="api_key">API_KEY</option>
<option value="ca">CA</option> <!-- <option value="ca">CA</option> -->
</select> </select>
</div> </div>
</div> </div>
@@ -23,7 +23,7 @@
</style> </style>
<script language="javascript"> <script language="javascript">
var url = '<c:url value="/onl/transaction/apim/apiSpecMan.json" />'; var url = '<c:url value="/onl/transaction/apim/apiSpecMan.json" />';
var url_org ='<c:url value="/onl/transaction/apim/apiSpecManPopup.view" />'; var url_org ='<c:url value="/onl/transaction/apim/apiSpecMan.view" />';
var isDetail = false; var isDetail = false;
var sampleRequestEditor, sampleResponseEditor, testbedSpecEditor; var sampleRequestEditor, sampleResponseEditor, testbedSpecEditor;
@@ -0,0 +1,132 @@
<%@ page language="java" contentType="text/html; charset=utf-8"%>
<%@ page import="java.io.*"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ include file="/jsp/common/include/localemessage.jsp" %>
<%
response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache");
response.setHeader("Expires", "0");
%>
<html>
<head>
<title>API 그룹 선택</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<jsp:include page="/jsp/common/include/css_custom.jsp"/>
<jsp:include page="/jsp/common/include/css.jsp"/>
<jsp:include page="/jsp/common/include/script.jsp"/>
<script language="javascript">
var url = '<c:url value="/onl/apim/apigroup/apiGroupMan.json" />';
function search() {
var postData = getSearchForJqgrid("cmd", "LIST");
$("#grid").setGridParam({url: url, postData: postData, page: 1}).trigger("reloadGrid");
}
$(document).ready(function() {
var urlParams = new URLSearchParams(window.location.search);
var selectedGroupIds = urlParams.get("selectedGroupIds");
if (selectedGroupIds) {
selectedGroupIds = selectedGroupIds.split(','); // 콤마로 구분된 ID들을 배열로 변환
} else {
selectedGroupIds = [];
}
$('#grid').jqGrid({
datatype: "json",
mtype: 'POST',
url: url,
postData: getSearchForJqgrid("cmd", "LIST"),
colNames: ['API 그룹 ID', 'API 그룹 명', '설명'],
colModel: [
{name: 'id', hidden: true},
{name: 'groupName', align: 'center', width: "180"},
{name: 'groupDesc', align: 'left', width: "200"}
],
jsonReader: {
repeatitems: false
},
pager: $('#pager'),
page: '${param.page}',
rowNum: '${rmsDefaultRowNum}',
autoheight: true,
height: 'auto',
width: 410,
autowidth: false,
viewrecords: true,
shrinkToFit: false,
multiselect: true,
multiboxonly: false,
loadComplete: function(data) {
var $grid = $(this);
$.each($grid.getDataIDs(), function(_, id) {
var rowData = $grid.getRowData(id);
if ($.inArray(rowData.id, selectedGroupIds) !== -1) {
$grid.jqGrid('setSelection', id, true);
}
});
}
});
$("#btn_search").click(search);
$("#btn_save").click(function() {
var selectedRows = $('#grid').getGridParam('selarrrow');
var selectedGroups = [];
if (selectedRows.length > 0) {
selectedGroups = selectedRows.map(function(rowid) {
var rowData = $('#grid').getRowData(rowid);
return {
id: rowData.id,
groupName: rowData.groupName
};
});
}
// 부모 창의 selectApiGroup 함수 호출
if (window.parent && typeof window.parent.selectApiGroup === "function") {
window.parent.selectApiGroup(selectedGroups);
window.close();
}
});
$("#btn_close").click(function () {
window.close();
});
// 검색어 입력 후 엔터 키 처리
$("input[name=searchGroupName]").keydown(function(key) {
if (key.keyCode == 13) {
search();
}
});
});
</script>
</head>
<body>
<div class="popup_box">
<div class="search_wrap">
<button type="button" class="cssbtn" id="btn_save" level="W">
<i class="material-icons">save</i> <%= localeMessage.getString("button.save") %>
</button>
<button type="button" class="cssbtn" id="btn_search" level="R">
<i class="material-icons">search</i> <%= localeMessage.getString("button.search") %>
</button>
<button type="button" class="cssbtn" id="btn_close" level="R" status="DETAIL"><i
class="material-icons">close</i> <%= localeMessage.getString("button.close") %>
</button>
</div>
<div class="title"></div>
<table class="search_condition" cellspacing="0">
<tr>
<th style="width:80px;">API 그룹 명</th>
<td>
<input type="text" name="searchGroupName" value="${param.searchGroupName}">
</td>
</tr>
</table>
<table id="grid"></table>
<div id="pager"></div>
</div>
</body>
</html>
@@ -0,0 +1,173 @@
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%
response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache");
response.setHeader("Expires", "0");
%>
<!doctype html>
<html lang="ko">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=1600" />
<title>OpenAPI Spec 에디터</title>
<%-- Tailwind (벤더된 Play CDN JS, 오프라인) --%>
<script src="<c:url value='/plugins/openapi/tailwind.js'/>"></script>
<script>
tailwind.config = { theme: { extend: { colors: { brand: {
50:'#eff6ff', 100:'#dbeafe', 500:'#3b82f6', 600:'#2563eb', 700:'#1d4ed8'
} } } } };
</script>
<%-- Swagger UI 5 (벤더) --%>
<link rel="stylesheet" href="<c:url value='/plugins/swaggerUI/swagger-ui.css'/>" />
<script src="<c:url value='/plugins/swaggerUI/swagger-ui-bundle.js'/>"></script>
<script src="<c:url value='/plugins/swaggerUI/swagger-ui-standalone-preset.js'/>"></script>
<script src="<c:url value='/plugins/swaggerUI/djb-swagger-i18n.js'/>" charset="UTF-8"></script>
<%-- js-yaml (벤더) --%>
<script src="<c:url value='/plugins/openapi/js-yaml.min.js'/>"></script>
<%-- CodeMirror (YAML 편집기 — Monaco 대체, admin addon) --%>
<link rel="stylesheet" href="<c:url value='/addon/codemirror/lib/codemirror.css'/>" />
<script src="<c:url value='/addon/codemirror/lib/codemirror.js'/>"></script>
<script src="<c:url value='/addon/codemirror/mode/yaml/yaml.js'/>"></script>
<script src="<c:url value='/addon/codemirror/mode/javascript/javascript.js'/>"></script>
<%-- jQuery + Summernote(lite, 무-Bootstrap) — 설명 리치 에디터 --%>
<link rel="stylesheet" href="<c:url value='/addon/summernote/summernote-lite.css'/>" />
<%-- 개발자포탈과 동일한 에디터 콘텐츠 스타일(.editor-content, Noto Sans KR 16px) --%>
<link rel="stylesheet" href="<c:url value='/js/djb/apispec/editor-content.css'/>" />
<script src="<c:url value='/js/jquery-1.12.1.min.js'/>"></script>
<script src="<c:url value='/addon/summernote/summernote-lite.min.js'/>"></script>
<script src="<c:url value='/addon/summernote/lang/summernote-ko-KR.js'/>"></script>
<link rel="stylesheet" href="<c:url value='/js/djb/apispec/styles.css'/>" />
<style>
/* 페이지 자체 세로 스크롤 제거 — 뷰포트 고정, 내부 패널만 스크롤 */
html, body { height: 100%; margin: 0; overflow-x: auto; overflow-y: hidden; }
#djb-wrap { height: 100vh; display: flex; flex-direction: column; }
#djb-wrap > header, #djb-wrap > nav { flex: 0 0 auto; }
#body { flex: 1 1 auto; min-height: 0 !important; overflow: hidden; }
#form-panel { display: flex; flex-direction: column; min-height: 0; overflow: hidden; }
#form-content { flex: 1 1 auto; min-height: 0; overflow-y: auto; }
#preview-panel { display: flex; flex-direction: column; min-height: 0; overflow: hidden; }
#preview-swagger, #preview-monaco { flex: 1 1 auto; min-height: 0; height: auto !important; overflow: auto; }
#preview-monaco .CodeMirror { height: 100%; }
/* 패널 내부 sticky 는 flex 행으로 (스크롤 컨테이너는 form-content / preview) */
#form-panel > .sticky, #preview-panel > .sticky { position: static !important; }
</style>
<script>
window.DJB_CTX = {
eaiSvcName: "${param.eaiSvcName}",
apiName: "${param.eaiSvcDesc}",
detailUrl: "<c:url value='/onl/transaction/apim/djbApiSpecMan.json'/>?cmd=DETAIL_SPEC&serviceType=APIGW",
saveUrl: "<c:url value='/onl/transaction/apim/djbApiSpecMan.json'/>?cmd=SAVE&serviceType=APIGW",
swaggerBase: "<c:url value='/plugins/swaggerUI/'/>",
gwAddress: "${gwAddress}",
orgPopupUrl: "<c:url value='/onl/transaction/apim/apiSpecMan.view'/>",
groupPopupUrl: "<c:url value='/onl/transaction/apim/djbApiSpecMan.view'/>?cmd=GROUP_POPUP",
jsonUrl: "<c:url value='/onl/transaction/apim/djbApiSpecMan.json'/>"
};
</script>
</head>
<body class="bg-slate-50 text-slate-800 antialiased" style="min-width:1600px;">
<div id="djb-wrap" class="mx-auto" style="width:1600px;">
<!-- ===== Header ===== -->
<header class="h-14 flex items-center justify-between px-6 bg-white border-b border-slate-200 sticky top-0 z-30">
<div class="flex items-center gap-3">
<div class="font-semibold text-slate-900">OpenAPI Spec 에디터</div>
<span class="text-slate-300">|</span>
<span class="text-sm text-slate-500">인터페이스:</span>
<span class="text-sm font-medium text-slate-800" id="hdr-project-name">${param.eaiSvcName}</span>
<span class="ml-2 px-2 py-0.5 text-[11px] rounded-full bg-slate-100 text-slate-600 border border-slate-200" id="hdr-version">v1.0.0</span>
<span id="hdr-source" class="hidden ml-1 px-2 py-0.5 text-[11px] rounded-full bg-emerald-50 text-emerald-700 border border-emerald-200"></span>
</div>
<div class="flex items-center gap-2">
<button id="btn-newwin" class="hidden px-3 py-1.5 text-sm rounded border border-slate-300 bg-white hover:bg-slate-50">새창으로 띄우기</button>
<button id="btn-regen" class="px-3 py-1.5 text-sm rounded border border-slate-300 bg-white hover:bg-slate-50">자동 생성(초기화)</button>
<button id="btn-save" class="px-3 py-1.5 text-sm rounded bg-emerald-600 text-white hover:bg-emerald-700">저장</button>
<div class="relative">
<button id="btn-export" class="px-3 py-1.5 text-sm rounded bg-brand-600 text-white hover:bg-brand-700">내보내기 ▾</button>
<div id="export-menu" class="hidden absolute right-0 mt-1 w-44 bg-white border border-slate-200 rounded shadow-lg z-40">
<button data-export="yaml" class="block w-full text-left px-3 py-2 text-sm hover:bg-slate-50">YAML 다운로드</button>
<button data-export="json" class="block w-full text-left px-3 py-2 text-sm hover:bg-slate-50">JSON 다운로드</button>
</div>
</div>
<button id="btn-close" class="px-3 py-1.5 text-sm rounded border border-slate-300 bg-white hover:bg-slate-50">닫기</button>
</div>
</header>
<!-- ===== Stepper ===== -->
<nav class="bg-white border-b border-slate-200 sticky z-20" style="top:56px;">
<div class="h-1 bg-slate-100">
<div id="stepper-progress" class="h-1 bg-brand-500 transition-all duration-300" style="width:16.66%"></div>
</div>
<ol id="stepper" class="grid grid-cols-5 px-2"></ol>
</nav>
<!-- ===== Body ===== -->
<main id="body" class="flex" style="min-height: calc(100vh - 56px - 72px);">
<section id="form-panel" class="bg-white border-r border-slate-200 transition-all duration-300" style="width:960px;">
<div class="flex items-center justify-between px-6 py-3 border-b border-slate-100 sticky bg-white z-10" style="top:128px;">
<div class="flex items-baseline gap-3">
<span class="text-xs uppercase tracking-wide text-slate-400">Step <span id="form-step-num">1</span> / 5</span>
<h2 class="text-base font-semibold text-slate-800" id="form-step-title">기본정보</h2>
</div>
<button id="btn-toggle-preview-from-form" class="hidden text-xs px-2 py-1 rounded border border-slate-200 text-slate-600 hover:bg-slate-50">▶ 미리보기 다시 열기</button>
</div>
<div id="form-content" class="px-6 py-5"></div>
<div class="sticky bottom-0 bg-white border-t border-slate-200 px-6 py-3 flex items-center justify-between">
<button id="btn-prev" class="px-4 py-2 text-sm rounded border border-slate-300 bg-white hover:bg-slate-50 disabled:opacity-40 disabled:cursor-not-allowed">◀ 이전</button>
<div class="text-xs text-slate-500" id="footer-hint">필수 항목을 채우고 다음 단계로 이동하세요</div>
<button id="btn-next" class="px-4 py-2 text-sm rounded bg-brand-600 text-white hover:bg-brand-700">다음 ▶</button>
</div>
</section>
<aside id="preview-panel" class="bg-slate-50 transition-all duration-300" style="width:640px;">
<div class="flex items-center justify-between px-4 py-2 border-b border-slate-200 bg-white sticky z-10" style="top:128px;">
<div class="flex items-center gap-1">
<button data-ptab="swagger" class="preview-tab px-3 py-1.5 text-sm rounded-t border-b-2 border-brand-600 text-brand-700 font-medium">Swagger UI</button>
<button data-ptab="yaml-ro" class="preview-tab px-3 py-1.5 text-sm rounded-t border-b-2 border-transparent text-slate-600 hover:text-slate-800">YAML 보기</button>
<button data-ptab="yaml-edit" class="preview-tab px-3 py-1.5 text-sm rounded-t border-b-2 border-transparent text-slate-600 hover:text-slate-800">스펙 편집</button>
</div>
<button id="btn-toggle-preview" class="text-xs px-2 py-1 rounded border border-slate-200 text-slate-600 hover:bg-slate-100">패널 숨기기 ▶</button>
</div>
<div id="yaml-edit-bar" class="hidden flex items-center justify-between bg-amber-50 border-b border-amber-200 px-4 py-2 text-xs">
<span class="text-amber-800">YAML 을 직접 편집한 뒤 [Form 에 적용] 을 눌러 양식에 동기화하세요.</span>
<div class="flex items-center gap-2">
<button id="btn-yaml-revert" class="px-2 py-1 rounded border border-amber-300 bg-white hover:bg-amber-100">변경 취소</button>
<button id="btn-yaml-apply" class="px-2 py-1 rounded bg-amber-600 text-white hover:bg-amber-700">Form 에 적용</button>
</div>
</div>
<div id="preview-swagger" class="overflow-auto" style="height: calc(100vh - 56px - 72px - 41px);"></div>
<div id="preview-monaco" class="hidden" style="height: calc(100vh - 56px - 72px - 41px);"></div>
</aside>
</main>
</div>
<div id="toast" class="fixed bottom-5 left-1/2 -translate-x-1/2 hidden px-4 py-2 rounded bg-slate-900 text-white text-sm shadow-lg z-50"></div>
<!-- Security scheme modal -->
<div id="sec-modal" class="hidden fixed inset-0 z-50 bg-slate-900/40 flex items-center justify-center">
<div class="bg-white rounded-lg shadow-xl w-[640px] max-h-[80vh] overflow-auto">
<div class="flex items-center justify-between px-5 py-3 border-b border-slate-200">
<h3 class="font-semibold text-slate-800">보안 스킴 추가</h3>
<button class="text-slate-400 hover:text-slate-700" data-sec-close>✕</button>
</div>
<div class="p-5" id="sec-modal-body"></div>
<div class="px-5 py-3 border-t border-slate-200 flex justify-end gap-2 bg-slate-50">
<button class="px-3 py-1.5 text-sm rounded border border-slate-300 bg-white" data-sec-close>취소</button>
<button id="btn-sec-save" class="px-3 py-1.5 text-sm rounded bg-brand-600 text-white">추가</button>
</div>
</div>
</div>
<script src="<c:url value='/js/djb/apispec/sample-data.js'/>"></script>
<script src="<c:url value='/js/djb/apispec/app.js'/>"></script>
</body>
</html>
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,122 @@
/*!
* djb-swagger-i18n.js
* Swagger UI 영문 라벨을 한글로 치환하는 i18n 패치 (방법 B - DOM patch)
* 배포 경로 권장: static/plugins/swaggerUI/djb-swagger-i18n.js
* index.html 의 swagger-initializer.js 직전 또는 직후에 <script> 로 로드
*
* ?lang=en 쿼리스트링이 있으면 패치 비활성화 (원문 보기)
* 매핑 카탈로그는 01-i18n-mapping/i18n-strings.csv 와 동기 유지
*/
(function (window) {
'use strict';
// ── 비활성화 옵션 ──
if (/[?&]lang=en\b/.test(window.location.search)) return;
// ── 매핑 (key 는 디버깅용, 실제 비교는 EN 문자열 일치) ──
var I18N_MAP = {
// P0 — OAuth2 모달 본문
'auth.modal.title': { en: 'Available authorizations', ko: '사용 가능한 인증' },
'auth.scopes.description': {
en: 'Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.',
ko: '스코프는 최종 사용자를 대신하여 애플리케이션이 데이터에 접근할 수 있는 권한 수준을 부여합니다. 각 API는 하나 이상의 스코프를 선언할 수 있습니다.'
},
'auth.scopes.swagger_grant': {
en: 'API requires the following scopes. Select which ones you want to grant to Swagger UI.',
ko: '이 API 는 아래 스코프가 필요합니다. Swagger UI 에 부여할 스코프를 선택하세요.'
},
'auth.flow.clientCredentials': { en: 'OAuth2 client credentials flow', ko: 'OAuth2 클라이언트 자격증명 흐름' },
'auth.flow.implicit': { en: 'OAuth2 implicit flow', ko: 'OAuth2 암묵적 흐름' },
'auth.flow.password': { en: 'OAuth2 password flow', ko: 'OAuth2 비밀번호 흐름' },
'auth.flow.authorizationCode': { en: 'OAuth2 authorization code flow', ko: 'OAuth2 인가 코드 흐름' },
'auth.field.tokenUrl': { en: 'Token URL:', ko: '토큰 URL:' },
'auth.field.flow': { en: 'Flow:', ko: '흐름:' },
'auth.field.clientId': { en: 'client_id:', ko: '클라이언트 ID (client_id):' },
'auth.field.clientSecret': { en: 'client_secret:',ko: '클라이언트 시크릿 (client_secret):' },
'auth.field.scopes': { en: 'Scopes:', ko: '스코프:' },
'auth.action.selectAll': { en: 'select all', ko: '모두 선택' },
'auth.action.selectNone': { en: 'select none', ko: '선택 해제' },
'auth.action.authorize': { en: 'Authorize', ko: '인증' },
'auth.action.close': { en: 'Close', ko: '닫기' },
'auth.action.logout': { en: 'Logout', ko: '로그아웃' },
'auth.modal.authorized': { en: 'authorized', ko: '인증됨' },
// P1 — 기타 인증 흐름
'auth.scheme.apiKey': { en: 'API key', ko: 'API 키' },
'auth.field.name': { en: 'name:', ko: '이름:' },
'auth.field.in': { en: 'in:', ko: '위치:' },
'auth.field.value': { en: 'Value:', ko: '값:' },
'basic.field.username': { en: 'Username:',ko: '사용자 ID:' },
'basic.field.password': { en: 'Password:',ko: '비밀번호:' }
// P2 (오퍼레이션/응답) 는 필요 시 추가
};
// 빠른 lookup 을 위해 EN → KO 인덱스 사전 생성
var EN_TO_KO = Object.create(null);
Object.keys(I18N_MAP).forEach(function (k) {
var e = I18N_MAP[k];
EN_TO_KO[e.en] = e.ko;
});
// ── 치환 대상 노드 식별 + 치환 ──
function translateNode(node) {
if (!node) return;
if (node.nodeType === Node.TEXT_NODE) {
var raw = node.nodeValue;
if (!raw) return;
var trimmed = raw.trim();
if (!trimmed) return;
// 1) 완전 일치 (가장 안전)
if (EN_TO_KO[trimmed]) {
node.nodeValue = raw.replace(trimmed, EN_TO_KO[trimmed]);
return;
}
// 2) 라벨 colon 패턴: "Token URL:" 같이 끝이 ":" 인 짧은 라벨
// (불필요 — 1번 완전 일치로 대부분 커버)
return;
}
if (node.nodeType !== Node.ELEMENT_NODE) return;
if (node.tagName === 'SCRIPT' || node.tagName === 'STYLE') return;
// input placeholder / button title 도 일부 케이스에 대비
if (node.tagName === 'INPUT' && node.placeholder && EN_TO_KO[node.placeholder.trim()]) {
node.placeholder = EN_TO_KO[node.placeholder.trim()];
}
var i, child = node.childNodes, len = child.length;
for (i = 0; i < len; i++) translateNode(child[i]);
}
function translateAll() {
var root = document.getElementById('swagger-ui') || document.body;
translateNode(root);
}
// ── MutationObserver — SwaggerUI 가 동적으로 DOM 을 다시 그릴 때마다 재적용 ──
var observer = new MutationObserver(function (mutations) {
for (var i = 0; i < mutations.length; i++) {
var m = mutations[i];
if (m.addedNodes && m.addedNodes.length) {
for (var j = 0; j < m.addedNodes.length; j++) translateNode(m.addedNodes[j]);
}
if (m.type === 'characterData') {
translateNode(m.target);
}
}
});
function start() {
translateAll();
observer.observe(document.body, {
childList: true,
subtree: true,
characterData: true
});
}
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', start);
} else {
start();
}
})(window);
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+83 -87
View File
@@ -1,10 +1,9 @@
plugins { plugins {
id 'java-library' id 'java-library'
id 'eclipse' id 'eclipse'
id 'eclipse-wtp' id 'eclipse-wtp'
id 'idea' id 'idea'
id 'war' id 'war'
id 'com.diffplug.eclipse.apt' version '3.41.1'
} }
group 'com.eactive' group 'com.eactive'
@@ -32,11 +31,11 @@ allprojects {
project.webAppDirName = 'WebContent' project.webAppDirName = 'WebContent'
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(8) languageVersion = JavaLanguageVersion.of(8)
} }
} }
sourceSets { sourceSets {
main { main {
java { java {
@@ -46,55 +45,56 @@ sourceSets {
} }
compileJava { compileJava {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
options.compilerArgs = ['-parameters'] options.compilerArgs = ['-parameters']
options.generatedSourceOutputDirectory = project.file(generatedJavaDir) options.generatedSourceOutputDirectory = project.file(generatedJavaDir)
aptOptions {
processorArgs = [ 'querydsl.generatedAnnotationClass' : 'com.querydsl.core.annotations.Generated' ]
}
} }
war { war {
def profile = project.findProperty("profile") ?: "tomcat" def profile = project.findProperty("profile") ?: "tomcat"
if (profile == "weblogic") { if (profile == "weblogic") {
webXml = file("WebContent/WEB-INF/weblogic-web.xml") webXml = file("WebContent/WEB-INF/weblogic-web.xml")
exclude 'WEB-INF/web.xml' exclude 'WEB-INF/web.xml'
} }
// rootSpec.exclude '**/persistence.xml' // rootSpec.exclude '**/persistence.xml'
exclude '**/context.xml' exclude '**/context.xml'
exclude '**/context-*.xml' exclude '**/context-*.xml'
archiveFileName = "eapim-admin.war" archiveFileName = "eapim-admin.war"
duplicatesStrategy = DuplicatesStrategy.WARN duplicatesStrategy = DuplicatesStrategy.WARN
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
options.compilerArgs += ['-parameters', "-Xlint:unchecked", "-Xlint:deprecation"] options.compilerArgs += ['-parameters', "-Xlint:unchecked", "-Xlint:deprecation"]
} }
dependencies { dependencies {
annotationProcessor "org.projectlombok:lombok:1.18.28", "org.projectlombok:lombok-mapstruct-binding:0.2.0", "org.mapstruct:mapstruct-processor:1.5.5.Final" annotationProcessor "org.projectlombok:lombok:1.18.28",
annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jpa", "jakarta.persistence:jakarta.persistence-api:2.2.3", "jakarta.annotation:jakarta.annotation-api:1.3.5" "org.projectlombok:lombok-mapstruct-binding:0.2.0",
"org.mapstruct:mapstruct-processor:1.5.5.Final"
annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jpa",
"jakarta.persistence:jakarta.persistence-api:2.2.3",
"jakarta.annotation:jakarta.annotation-api:1.3.5"
implementation project(':elink-online-core') implementation project(':elink-online-core')
implementation project(':elink-online-transformer') implementation project(':elink-online-transformer')
implementation project(':elink-online-common') implementation project(':elink-online-common')
implementation project(':elink-online-emsclient') implementation project(':elink-online-emsclient')
implementation project(':elink-portal-common') implementation project(':elink-portal-common')
//implementation project(':kjb-safedb') //implementation project(':kjb-safedb')
implementation project(":eapim-admin-djb") implementation project(":eapim-admin-djb")
/* Custom Libs */ /* Custom Libs (damo-manager.jar 는 Tomcat lib 가 런타임 제공 → compileOnly, WAR 미포함) */
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'], exclude: ['damo-manager.jar'])
compileOnly files('libs/damo-manager.jar')
//implementation "org.dom4j:dom4j:2.1.3" //implementation "org.dom4j:dom4j:2.1.3"
//implementation "com.rabbitmq:amqp-client:3.6.6" //implementation "com.rabbitmq:amqp-client:3.6.6"
implementation "commons-primitives:commons-primitives:1.0" implementation "commons-primitives:commons-primitives:1.0"
@@ -116,10 +116,10 @@ dependencies {
// https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api // https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1' compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.1' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.1'
//implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: '2.13.1' //implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: '2.13.1'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1'
implementation "javax.jms:javax.jms-api:2.0" implementation "javax.jms:javax.jms-api:2.0"
implementation "org.snmp4j:snmp4j:1.10.1" implementation "org.snmp4j:snmp4j:1.10.1"
@@ -186,32 +186,32 @@ dependencies {
implementation 'ch.qos.logback:logback-classic:1.2.10' implementation 'ch.qos.logback:logback-classic:1.2.10'
implementation 'ch.qos.logback:logback-access:1.2.10' implementation 'ch.qos.logback:logback-access:1.2.10'
implementation 'ch.qos.logback:logback-core:1.2.10' implementation 'ch.qos.logback:logback-core:1.2.10'
implementation files("libs/eai-bap-client.jar")
compileOnly 'javax.xml.bind:jaxb-api:2.3.1'
//implementation 'org.postgresql:postgresql:42.2.23'
implementation 'backport-util-concurrent:backport-util-concurrent:3.0'
implementation ('software.amazon.awssdk:s3:2.20.142') {
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.slf4j', module: 'logback-classic'
}
implementation 'software.amazon.awssdk:sso:2.20.142'
implementation 'software.amazon.awssdk:sts:2.20.142'
implementation group: 'commons-net', name: 'commons-net', version: '3.5' implementation files("libs/eai-bap-client.jar")
// JDK 8 의 rt.jar 에는 org.w3c.dom.ElementTraversal 이 없어 xercesImpl 가 NCDFE 를 일으킴. compileOnly 'javax.xml.bind:jaxb-api:2.3.1'
// xml-apis 1.4.01 에 그 클래스가 포함됨. 직접 의존성으로 묶어 WAR 에 패키징되도록 함.
implementation 'xml-apis:xml-apis:1.4.01'
testRuntimeOnly 'com.h2database:h2:2.1.214' //implementation 'org.postgresql:postgresql:42.2.23'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' implementation 'backport-util-concurrent:backport-util-concurrent:3.0'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.15'
implementation ('software.amazon.awssdk:s3:2.20.142') {
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.slf4j', module: 'logback-classic'
}
implementation 'software.amazon.awssdk:sso:2.20.142'
implementation 'software.amazon.awssdk:sts:2.20.142'
implementation group: 'commons-net', name: 'commons-net', version: '3.5'
// JDK 8 의 rt.jar 에는 org.w3c.dom.ElementTraversal 이 없어 xercesImpl 가 NCDFE 를 일으킴.
// xml-apis 1.4.01 에 그 클래스가 포함됨. 직접 의존성으로 묶어 WAR 에 패키징되도록 함.
implementation 'xml-apis:xml-apis:1.4.01'
testRuntimeOnly 'com.h2database:h2:2.1.214'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.15'
} }
test { test {
@@ -219,9 +219,9 @@ test {
} }
configurations.all { configurations.all {
exclude group: 'log4j', module: 'log4j' exclude group: 'log4j', module: 'log4j'
exclude group: 'org.apache.activemq' exclude group: 'org.apache.activemq'
exclude group: 'org.codehaus.jackson' exclude group: 'org.codehaus.jackson'
resolutionStrategy { resolutionStrategy {
// 10 minute cache of dynamic version navigation // 10 minute cache of dynamic version navigation
cacheDynamicVersionsFor 10, 'minutes' cacheDynamicVersionsFor 10, 'minutes'
@@ -245,29 +245,25 @@ task settingEclipseEncoding {
} }
task initDirs() { task initDirs() {
file(generatedJavaDir).mkdirs() file(generatedJavaDir).mkdirs()
} }
eclipse { eclipse {
wtp { wtp {
component { component {
contextPath = 'monitoring' contextPath = 'monitoring'
} }
} }
synchronizationTasks settingEclipseEncoding, initDirs synchronizationTasks settingEclipseEncoding, initDirs
jdt { jdt {
apt {
// generated 된 패스 경로를 .setting/org.eclipse.jdt.apt.core.prefs 의 org.eclipse.jdt.apt.genSrcDir에 적용한다. }
// project > properties > Java Compiler > Annoation Processing 화면에서 확인 가능하다. project {
genSrcDir = file(generatedJavaDir) if (!natures.contains('org.eclipse.buildship.core.gradleprojectnature')) {
} natures.add('org.eclipse.buildship.core.gradleprojectnature')
} buildCommand 'org.eclipse.buildship.core.gradleprojectbuilder'
project { }
if (!natures.contains('org.eclipse.buildship.core.gradleprojectnature')) { }
natures.add('org.eclipse.buildship.core.gradleprojectnature')
buildCommand 'org.eclipse.buildship.core.gradleprojectbuilder'
}
}
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
+61 -34
View File
@@ -1,9 +1,9 @@
plugins { plugins {
id 'java-library' id 'java-library'
id 'eclipse'
id 'eclipse-wtp'
id 'idea' id 'idea'
id 'war' id 'war'
id 'project-report'
id 'checkstyle'
} }
group 'com.eactive' group 'com.eactive'
@@ -14,17 +14,19 @@ def quartzVersion = "2.2.1"
def queryDslVersion = "5.0.0" def queryDslVersion = "5.0.0"
def hibernateVersion = "5.6.15.Final" def hibernateVersion = "5.6.15.Final"
/*def nexusUrl = "https://nexus.eactive.synology.me:8090"*/ def nexusUrl = "https://nexus.eactive.synology.me:8090"
//def useOnJboss = false //def useOnJboss = false
def generatedJavaDir = "$buildDir/generated/java" def generatedJavaDir = "$buildDir/generated/java"
/*repositories { allprojects {
maven { repositories {
url "${nexusUrl}/repository/maven-public/" maven {
allowInsecureProtocol = true url "${nexusUrl}/repository/maven-public/"
} allowInsecureProtocol = true
}*/ }
}
}
project.webAppDirName = 'WebContent' project.webAppDirName = 'WebContent'
@@ -34,10 +36,6 @@ java {
} }
} }
checkstyle {
toolVersion = '8.45.1'
}
sourceSets { sourceSets {
main { main {
java { java {
@@ -48,10 +46,7 @@ sourceSets {
compileJava { compileJava {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
options.compilerArgs = [ options.compilerArgs = ['-parameters']
'-parameters',
'-Aquerydsl.generatedAnnotationClass=com.querydsl.core.annotations.Generated'
]
options.generatedSourceOutputDirectory = project.file(generatedJavaDir) options.generatedSourceOutputDirectory = project.file(generatedJavaDir)
} }
@@ -67,7 +62,6 @@ war {
// rootSpec.exclude '**/persistence.xml' // rootSpec.exclude '**/persistence.xml'
exclude '**/context.xml' exclude '**/context.xml'
exclude '**/context-*.xml' exclude '**/context-*.xml'
exclude '**/context_*.xml'
archiveFileName = "eapim-admin.war" archiveFileName = "eapim-admin.war"
duplicatesStrategy = DuplicatesStrategy.WARN duplicatesStrategy = DuplicatesStrategy.WARN
} }
@@ -89,11 +83,12 @@ dependencies {
implementation project(':elink-online-common') implementation project(':elink-online-common')
implementation project(':elink-online-emsclient') implementation project(':elink-online-emsclient')
implementation project(':elink-portal-common') implementation project(':elink-portal-common')
implementation project(':kjb-safedb') //implementation project(':kjb-safedb')
implementation project(":eapim-admin-kjb") implementation project(":eapim-admin-djb")
/* Custom Libs */ /* Custom Libs (damo-manager.jar 는 Tomcat lib 가 런타임 제공 → compileOnly, WAR 미포함) */
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'], exclude: ['damo-manager.jar'])
compileOnly files('libs/damo-manager.jar')
//implementation "org.dom4j:dom4j:2.1.3" //implementation "org.dom4j:dom4j:2.1.3"
//implementation "com.rabbitmq:amqp-client:3.6.6" //implementation "com.rabbitmq:amqp-client:3.6.6"
@@ -126,7 +121,7 @@ dependencies {
implementation "org.snmp4j:snmp4j:1.10.1" implementation "org.snmp4j:snmp4j:1.10.1"
implementation "com.googlecode.json-simple:json-simple:1.1.1" implementation "com.googlecode.json-simple:json-simple:1.1.1"
implementation "io.netty:netty-all:4.1.0.Final" implementation "io.netty:netty-all:4.1.94.Final"
compileOnly "org.apache.mina:mina-filter-ssl:1.1.6" compileOnly "org.apache.mina:mina-filter-ssl:1.1.6"
compileOnly "org.apache.mina:mina-core:1.1.6" compileOnly "org.apache.mina:mina-core:1.1.6"
@@ -203,13 +198,12 @@ dependencies {
implementation 'software.amazon.awssdk:sso:2.20.142' implementation 'software.amazon.awssdk:sso:2.20.142'
implementation 'software.amazon.awssdk:sts:2.20.142' implementation 'software.amazon.awssdk:sts:2.20.142'
implementation ('io.kubernetes:client-java:18.0.1') {
exclude group: 'org.slf4j', module: 'slf4j-api'
exclude group: 'org.slf4j', module: 'logback-classic'
}
implementation group: 'commons-net', name: 'commons-net', version: '3.5' implementation group: 'commons-net', name: 'commons-net', version: '3.5'
// JDK 8 의 rt.jar 에는 org.w3c.dom.ElementTraversal 이 없어 xercesImpl 가 NCDFE 를 일으킴.
// xml-apis 1.4.01 에 그 클래스가 포함됨. 직접 의존성으로 묶어 WAR 에 패키징되도록 함.
implementation 'xml-apis:xml-apis:1.4.01'
testRuntimeOnly 'com.h2database:h2:2.1.214' testRuntimeOnly 'com.h2database:h2:2.1.214'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
@@ -229,18 +223,51 @@ configurations.all {
cacheDynamicVersionsFor 10, 'minutes' cacheDynamicVersionsFor 10, 'minutes'
// Do not cache changing modules // Do not cache changing modules
cacheChangingModulesFor 0, 'seconds' cacheChangingModulesFor 0, 'seconds'
// JDK 8 의 rt.jar 에는 org.w3c.dom.ElementTraversal 이 없음.
// 일부 transitive 가 끌어오는 xml-apis:1.0.b2 (2002, DOM L2) 는 이 클래스를 포함하지 않아
// xercesImpl 가 NoClassDefFoundError 를 일으킴 → 1.4.01 로 강제 통일.
force 'xml-apis:xml-apis:1.4.01'
} }
} }
task settingEclipseEncoding {
if (project.file('.settings').exists()) {
File f = file('.settings/org.eclipse.core.resources.prefs')
f.write('eclipse.preferences.version=1\n')
f.append('encoding/<project>=utf-8')
}
}
task initDirs() { task initDirs() {
file(generatedJavaDir).mkdirs() file(generatedJavaDir).mkdirs()
} }
eclipse {
tasks.withType(Checkstyle) { wtp {
reports { component {
xml.required = false contextPath = 'monitoring'
html.required = true }
} }
synchronizationTasks settingEclipseEncoding, initDirs
jdt {
apt {
// generated 된 패스 경로를 .setting/org.eclipse.jdt.apt.core.prefs 의 org.eclipse.jdt.apt.genSrcDir에 적용한다.
// project > properties > Java Compiler > Annoation Processing 화면에서 확인 가능하다.
genSrcDir = file(generatedJavaDir)
}
}
project {
if (!natures.contains('org.eclipse.buildship.core.gradleprojectnature')) {
natures.add('org.eclipse.buildship.core.gradleprojectnature')
buildCommand 'org.eclipse.buildship.core.gradleprojectbuilder'
}
}
} }
tasks.withType(JavaCompile) {
options.fork = true // 컴파일을 별도 프로세스로 분리
options.forkOptions.memoryMaximumSize = '4g' // 컴파일러에 2GB 할당 (필요시 4g로 증량)
options.encoding = 'UTF-8'
}
+51
View File
@@ -0,0 +1,51 @@
# DJBank EAPIM Admin — user-scope systemd unit
#
# Install (one-time, on the host as `djb`):
# sudo loginctl enable-linger djb # allow services to outlive ssh logout
# mkdir -p ~/.config/systemd/user
# # workflow copies this file in on each deploy; for first boot you can also do:
# # cp /prod/.../deploy/systemd/eapim-admin.service ~/.config/systemd/user/
# systemctl --user daemon-reload
# systemctl --user enable eapim-admin
# systemctl --user start eapim-admin
#
# Why this exists:
# - `catalina.sh start` + `nohup &` does NOT escape the Gitea Actions runner
# process group. When the workflow step finishes, the runner sends SIGTERM
# to the process tree and Tomcat dies seconds after boot.
# - Running Tomcat as a systemd user service detaches lifecycle from the
# runner entirely. The workflow just calls `systemctl --user restart` and
# systemd owns the process.
[Unit]
Description=DJBank EAPIM Admin (Tomcat 9)
After=network-online.target
Wants=network-online.target
[Service]
Type=simple
Environment=JAVA_HOME=/apps/opts/jdk17
Environment=CATALINA_BASE=/prod/eapim/adminportal
Environment=CATALINA_HOME=/prod/eapim/apache-tomcat-9.0.116
Environment=CATALINA_PID=/prod/eapim/adminportal/temp/catalina.pid
# `catalina.sh run` keeps Tomcat in the foreground so systemd can supervise it.
ExecStart=/prod/eapim/apache-tomcat-9.0.116/bin/catalina.sh run
# Graceful shutdown via Tomcat's shutdown port, 30s window.
ExecStop=/prod/eapim/apache-tomcat-9.0.116/bin/catalina.sh stop 30
# Tomcat returns 143 on SIGTERM during normal stop — treat as success.
SuccessExitStatus=143
TimeoutStartSec=180
TimeoutStopSec=60
Restart=on-failure
RestartSec=10
# Memory / fd limits — adjust as needed.
LimitNOFILE=65535
[Install]
WantedBy=default.target
Binary file not shown.
@@ -33,6 +33,7 @@ import com.eactive.eai.rms.data.entity.man.role.Role;
import com.eactive.eai.rms.data.entity.man.role.RoleService; import com.eactive.eai.rms.data.entity.man.role.RoleService;
import com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusinessService; import com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusinessService;
import com.eactive.eai.rms.onl.common.exception.BizException; import com.eactive.eai.rms.onl.common.exception.BizException;
import com.eactive.ext.djb.DamoManager;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -99,7 +100,7 @@ public class UserManService extends BaseService {
userInfo.setRoleidnfiname(CommonConstants.DEPT_DEVELOPER); userInfo.setRoleidnfiname(CommonConstants.DEPT_DEVELOPER);
try { try {
userInfo.setPassword(Seed.encrypt(userUI.getUserId())); userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,userUI.getUserId()));
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("Error encrypting password", e); throw new RuntimeException("Error encrypting password", e);
} }
@@ -140,7 +141,7 @@ public class UserManService extends BaseService {
public void updatePassword(UserUI userUI) throws Exception { public void updatePassword(UserUI userUI) throws Exception {
UserInfo userInfo = userInfoService.getById(userUI.getUserId()); UserInfo userInfo = userInfoService.getById(userUI.getUserId());
userInfo.setPassword(Seed.encrypt(userUI.getUserId())); userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256, userUI.getUserId()));
userUIMapper.updateToEntity(userUI, userInfo); userUIMapper.updateToEntity(userUI, userInfo);
userInfoService.save(userInfo); userInfoService.save(userInfo);
} }
@@ -21,6 +21,7 @@ import com.eactive.eai.rms.data.entity.man.user.UserServiceType;
import com.eactive.eai.rms.data.entity.man.user.UserServiceTypeId; import com.eactive.eai.rms.data.entity.man.user.UserServiceTypeId;
import com.eactive.eai.rms.data.entity.man.user.UserServiceTypeService; import com.eactive.eai.rms.data.entity.man.user.UserServiceTypeService;
import com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusinessService; import com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusinessService;
import com.eactive.ext.djb.DamoManager;
@Service @Service
@Transactional @Transactional
@@ -124,7 +125,7 @@ public class UserSyncService extends BaseService {
UserInfo userInfo = new UserInfo(); UserInfo userInfo = new UserInfo();
userInfo.setUserid(userId); userInfo.setUserid(userId);
userInfo.setUsername(userInfoMap.get("EMPY_NM").toString()); userInfo.setUsername(userInfoMap.get("EMPY_NM").toString());
userInfo.setPassword(Seed.encrypt(userId)); userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,userId));
userInfo.setRoleidnfiname(CommonConstants.DEPT_DEVELOPER); userInfo.setRoleidnfiname(CommonConstants.DEPT_DEVELOPER);
userInfoService.save(userInfo); userInfoService.save(userInfo);
@@ -53,9 +53,11 @@ class RequestWrapper extends HttpServletRequestWrapper {
"^data:image/.*", "^data:image/.*",
Pattern.CASE_INSENSITIVE); Pattern.CASE_INSENSITIVE);
// XSS 문자 변환을 건너뛸 파라미터 목록 (리치 텍스트 에디터 콘텐츠 등) // XSS 문자 변환을 건너뛸 파라미터 목록 (리치 텍스트 에디터 콘텐츠, 메시지 템플릿 본문 등)
// XSS 패턴 필터링은 적용하지만 &lt;, &gt; 등으로 변환하지 않음 // XSS 패턴 필터링은 적용하지만 &lt;, &gt;, &#38; 등으로 변환하지 않음
private static final String[] SKIP_CHAR_CONVERT_PARAMS = {"contents", "content", "description"}; // (메시지 템플릿은 SMS/메신저 평문으로 전송되므로 '&'가 '&#38;'로 깨지면 안 됨)
private static final String[] SKIP_CHAR_CONVERT_PARAMS = {"contents", "content", "description",
"subjectTemplate", "smsTemplate", "emailTemplate", "messengerTemplate"};
// 현재 처리 중인 파라미터명 (cleanXSS에서 문자 변환 여부 결정에 사용) // 현재 처리 중인 파라미터명 (cleanXSS에서 문자 변환 여부 결정에 사용)
private ThreadLocal<String> currentParameter = new ThreadLocal<>(); private ThreadLocal<String> currentParameter = new ThreadLocal<>();
@@ -33,6 +33,7 @@ import org.springframework.web.servlet.View;
import com.eactive.eai.common.seed.Seed; import com.eactive.eai.common.seed.Seed;
import com.eactive.eai.rms.ext.kjb.smsauth.SmsAuthService; import com.eactive.eai.rms.ext.kjb.smsauth.SmsAuthService;
import com.eactive.ext.djb.DamoManager;
import com.eactive.eai.data.converter.LocalDateTimeFormatters; import com.eactive.eai.data.converter.LocalDateTimeFormatters;
import com.eactive.eai.rms.common.context.MonitoringContext; import com.eactive.eai.rms.common.context.MonitoringContext;
import com.eactive.eai.rms.common.datasource.DataSourceType; import com.eactive.eai.rms.common.datasource.DataSourceType;
@@ -72,7 +73,8 @@ public class MainController implements InterceptorSkipController {
private final LoginService loginService; private final LoginService loginService;
private final MonitoringPropertyService monitoringPropertyService; private final MonitoringPropertyService monitoringPropertyService;
private final UserLoginHistoryService userLoginHistoryService; private final UserLoginHistoryService userLoginHistoryService;
private final SmsAuthService smsAuthService;
@Autowired @Autowired
public MainController(LocaleMessage localeMessage, public MainController(LocaleMessage localeMessage,
MonitoringContext monitoringContext, MonitoringContext monitoringContext,
@@ -81,7 +83,8 @@ public class MainController implements InterceptorSkipController {
UserRoleService userRoleService, UserRoleService userRoleService,
UserServiceTypeService userServiceTypeService, UserServiceTypeService userServiceTypeService,
MonitoringPropertyService monitoringPropertyService, MonitoringPropertyService monitoringPropertyService,
UserLoginHistoryService userLoginHistoryService) { UserLoginHistoryService userLoginHistoryService,
SmsAuthService smsAuthService) {
this.localeMessage = localeMessage; this.localeMessage = localeMessage;
this.monitoringContext = monitoringContext; this.monitoringContext = monitoringContext;
this.userInfoService = userInfoService; this.userInfoService = userInfoService;
@@ -90,6 +93,7 @@ public class MainController implements InterceptorSkipController {
this.userServiceTypeService = userServiceTypeService; this.userServiceTypeService = userServiceTypeService;
this.monitoringPropertyService = monitoringPropertyService; this.monitoringPropertyService = monitoringPropertyService;
this.userLoginHistoryService = userLoginHistoryService; this.userLoginHistoryService = userLoginHistoryService;
this.smsAuthService = smsAuthService;
} }
@RequestMapping(value = "/loginForm.do") @RequestMapping(value = "/loginForm.do")
@@ -202,7 +206,7 @@ public class MainController implements InterceptorSkipController {
// SMS 인증번호 생성 및 발송 // SMS 인증번호 생성 및 발송
String authCode = smsAuthService.generateAuthCode(); String authCode = smsAuthService.generateAuthCode();
boolean sent = smsAuthService.sendAuthCode(userInfo.getCphnno(), authCode); boolean sent = smsAuthService.sendAuthCode(userInfo, authCode);
if (!sent) { if (!sent) {
return LoginResponseDto.builder() return LoginResponseDto.builder()
@@ -263,16 +267,8 @@ public class MainController implements InterceptorSkipController {
} }
} }
/**
* SmsAuthService 인스턴스 조회 (singleton)
*/
private SmsAuthService getSmsAuthService() { private SmsAuthService getSmsAuthService() {
try { return smsAuthService;
return SmsAuthService.getInstance();
} catch (Exception e) {
logger.warn("SmsAuthService 초기화 실패 - SMS 인증 비활성화 처리", e);
return null;
}
} }
/** /**
@@ -363,7 +359,7 @@ public class MainController implements InterceptorSkipController {
String loginMode = System.getProperty("login.mode"); String loginMode = System.getProperty("login.mode");
if("db".equals(loginMode) || "DB".equals(loginMode)) { if("db".equals(loginMode) || "DB".equals(loginMode)) {
/* 기존로직 - LDAP 사용 x */ /* 기존로직 - LDAP 사용 x */
if (!userInfo.getPassword().equals(Seed.encrypt(dto.getPassword()))) { if (!userInfo.getPassword().equals(DamoManager.getInstance().hash(DamoManager.SHA256, dto.getPassword()))) {
// password 다름. // password 다름.
setLoginFailure(request, session, "login.loginfail1", setLoginFailure(request, session, "login.loginfail1",
"login.loginfail2"); "login.loginfail2");
@@ -799,9 +795,9 @@ public class MainController implements InterceptorSkipController {
.getString("login.pwdmismatch4")); .getString("login.pwdmismatch4"));
return REDIRECT_CHANGE_PASSWORD_URL; return REDIRECT_CHANGE_PASSWORD_URL;
} }
// 3. 비밀번호 체크 // 3. 비밀번호 체크
if (!userInfo.getPassword().equals(Seed.encrypt(resetPassword)) if (!userInfo.getPassword().equals(DamoManager.getInstance().hash(DamoManager.SHA256,resetPassword))
|| !userInfo.getUserid().equals(resetUserId)) { || !userInfo.getUserid().equals(resetUserId)) {
UserAccessLogger.log(request, LOG_CATEGORY_LOGIN, "F", UserAccessLogger.log(request, LOG_CATEGORY_LOGIN, "F",
localeMessage localeMessage
@@ -812,7 +808,7 @@ public class MainController implements InterceptorSkipController {
} }
// 4. 비밀번호 변경 // 4. 비밀번호 변경
userInfo.setPassword(Seed.encrypt(changePassword)); userInfo.setPassword(DamoManager.getInstance().hash(DamoManager.SHA256,changePassword));
userInfoService.save(userInfo); userInfoService.save(userInfo);
UserAccessLogger.log(request, LOG_CATEGORY_LOGIN, "S", localeMessage UserAccessLogger.log(request, LOG_CATEGORY_LOGIN, "S", localeMessage
@@ -35,6 +35,7 @@ public class MonitoringPropertyManService extends BaseService {
public MonitoringPropertyGroupUI selectDetail(String prptyGroupName) { public MonitoringPropertyGroupUI selectDetail(String prptyGroupName) {
MonitoringPropertyGroup propertyGroup = propertyGroupService.getById(prptyGroupName); MonitoringPropertyGroup propertyGroup = propertyGroupService.getById(prptyGroupName);
propertyGroup.getMonitoringProperties().sort(Comparator.comparing(p -> p.getId().getPrptyName()));
return propertyGroupMapper.toVo(propertyGroup); return propertyGroupMapper.toVo(propertyGroup);
} }
@@ -57,7 +57,7 @@ public class ClusteredSchedulerConfig {
quartzProperties.put("org.quartz.jobStore.misfireThreshold", "60000"); quartzProperties.put("org.quartz.jobStore.misfireThreshold", "60000");
quartzProperties.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX"); quartzProperties.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX");
quartzProperties.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate"); quartzProperties.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.StdJDBCDelegate");
quartzProperties.put("org.quartz.jobStore.useProperties", "false"); quartzProperties.put("org.quartz.jobStore.useProperties", "false");
quartzProperties.put("org.quartz.jobStore.dataSource", monitoringSchema); quartzProperties.put("org.quartz.jobStore.dataSource", monitoringSchema);
quartzProperties.put("org.quartz.jobStore.tablePrefix", monitoringSchema + ".QRTZ_"); quartzProperties.put("org.quartz.jobStore.tablePrefix", monitoringSchema + ".QRTZ_");
@@ -15,4 +15,6 @@ public interface EMSScheduler {
void deleteAndAddJob(Scheduler scheduler, String jobName) throws SchedulerException, ClassNotFoundException; void deleteAndAddJob(Scheduler scheduler, String jobName) throws SchedulerException, ClassNotFoundException;
void reloadJob(String jobName) throws SchedulerException, ClassNotFoundException;
} }
@@ -120,12 +120,60 @@ public class EMSSchedulerImpl implements EMSScheduler {
} }
} }
@Override
public void reloadJob(String jobName) throws SchedulerException, ClassNotFoundException {
JobInfo jobInfo = jobInfoService.getById(jobName);
if (CLUSTERED.equals(jobInfo.getInstanceName())) {
deleteJob(scheduler, jobName);
reloadClusteredJob(jobInfo);
} else {
deleteAndAddJob(scheduler, jobInfo);
deleteJob(clusteredScheduler, jobName);
}
}
private void reloadClusteredJob(JobInfo jobInfo) throws SchedulerException, ClassNotFoundException {
String jobId = jobInfo.getId();
TriggerKey triggerKey = new TriggerKey(getTriggerName(jobId), Scheduler.DEFAULT_GROUP);
JobKey jobKey = new JobKey(jobId, Scheduler.DEFAULT_GROUP);
Trigger existing = clusteredScheduler.getTrigger(triggerKey);
JobDetail existingJob = clusteredScheduler.getJobDetail(jobKey);
if (existing != null && existingJob != null) {
// JobDetail(JobData 포함) 갱신
@SuppressWarnings("unchecked")
Class<Job> jobClass = (Class<Job>) Class.forName(jobInfo.getJobClassName());
JobBuilder jobBuilder = newJob(jobClass).withIdentity(jobKey);
for (JobData jobData : jobInfo.getJobDatas()) {
jobBuilder.usingJobData(jobData.getId().getDataKey(), jobData.getDataValue());
}
clusteredScheduler.addJob(jobBuilder.build(), true);
// 트리거(cron) 갱신
CronTrigger newTrigger = newTrigger()
.withIdentity(triggerKey)
.withSchedule(cronSchedule(jobInfo.getCronExp()))
.build();
Date ft = clusteredScheduler.rescheduleJob(triggerKey, newTrigger);
if (ft != null) {
return;
}
log.warn("[reloadClusteredJob] {} rescheduleJob returned null, falling back to deleteAndAddJob", jobId);
} else if (existing != null) {
// orphaned trigger (job missing) — clean up before re-adding
log.warn("[reloadClusteredJob] {} has orphaned trigger without job, unscheduling", jobId);
clusteredScheduler.unscheduleJob(triggerKey);
}
deleteAndAddJob(clusteredScheduler, jobInfo);
}
public void deleteJob(Scheduler inScheduler, String jobNm) throws SchedulerException { public void deleteJob(Scheduler inScheduler, String jobNm) throws SchedulerException {
String schedulerType = (inScheduler == clusteredScheduler) ? "clusteredScheduler" : "scheduler";
JobKey key = new JobKey(jobNm, Scheduler.DEFAULT_GROUP); JobKey key = new JobKey(jobNm, Scheduler.DEFAULT_GROUP);
JobDetail jobDetail = inScheduler.getJobDetail(key); JobDetail jobDetail = inScheduler.getJobDetail(key);
if (jobDetail != null) { if (jobDetail != null) {
inScheduler.deleteJob(key); inScheduler.deleteJob(key);
log.info(jobNm + " has been scheduled to deleted");
} }
} }
@@ -151,10 +199,7 @@ public class EMSSchedulerImpl implements EMSScheduler {
.withSchedule(cronSchedule(info.getCronExp())) .withSchedule(cronSchedule(info.getCronExp()))
.build(); .build();
Date ft = inScheduler.scheduleJob(job, trigger); inScheduler.scheduleJob(job, trigger);
log
.info("{} has been scheduled to run at: {} and repeat based on expression: {}", job.getKey(), ft,
trigger.getCronExpression());
} }
} }
@@ -45,6 +45,9 @@ public class SchedulerManController extends BaseAnnotationController {
@Qualifier("monitoringSyncAgent") @Qualifier("monitoringSyncAgent")
private MonitoringSyncAgent monitoringSyncAgent; private MonitoringSyncAgent monitoringSyncAgent;
@Autowired
private EMSScheduler emsScheduler;
@GetMapping(value = "/common/scheduler/schedulerMan.view") @GetMapping(value = "/common/scheduler/schedulerMan.view")
public String viewList() { public String viewList() {
return "/common/scheduler/schedulerMan"; return "/common/scheduler/schedulerMan";
@@ -96,6 +99,11 @@ public class SchedulerManController extends BaseAnnotationController {
@PostMapping(value = "/common/scheduler/schedulerMan.json", params = "cmd=UPDATE") @PostMapping(value = "/common/scheduler/schedulerMan.json", params = "cmd=UPDATE")
public ResponseEntity<Void> update(JobInfoUI jobInfoUI) { public ResponseEntity<Void> update(JobInfoUI jobInfoUI) {
service.update(jobInfoUI); service.update(jobInfoUI);
try {
emsScheduler.reloadJob(jobInfoUI.getId());
} catch (Exception e) {
logger.error("reloadJob error on current server", e);
}
syncReloadScheduler(jobInfoUI.getId()); syncReloadScheduler(jobInfoUI.getId());
return ResponseEntity.ok().build(); return ResponseEntity.ok().build();
} }
@@ -115,7 +123,7 @@ public class SchedulerManController extends BaseAnnotationController {
String url = "/monitoring/schedulerReload.do"; String url = "/monitoring/schedulerReload.do";
try { try {
ret = monitoringSyncAgent.sync(url, paramMap); ret = monitoringSyncAgent.targetSync(url, paramMap);
} catch (Exception e) { } catch (Exception e) {
logger.error("syncReloadScheduler error", e); logger.error("syncReloadScheduler error", e);
} finally { } finally {
@@ -2,6 +2,7 @@ package com.eactive.eai.rms.data.entity.onl.apim.apigroup;
import com.eactive.eai.data.entity.onl.apim.apigroup.ApiGroup; import com.eactive.eai.data.entity.onl.apim.apigroup.ApiGroup;
import com.eactive.eai.data.entity.onl.apim.apigroup.ApiGroupApi; import com.eactive.eai.data.entity.onl.apim.apigroup.ApiGroupApi;
import com.eactive.eai.data.entity.onl.apim.apigroup.ApiGroupApiId;
import com.eactive.eai.data.entity.onl.apim.apigroup.QApiGroup; import com.eactive.eai.data.entity.onl.apim.apigroup.QApiGroup;
import com.eactive.eai.data.entity.onl.apim.apigroup.QApiGroupApi; import com.eactive.eai.data.entity.onl.apim.apigroup.QApiGroupApi;
import com.eactive.eai.data.jpa.AbstractDataService; import com.eactive.eai.data.jpa.AbstractDataService;
@@ -75,4 +76,37 @@ public class ApiGroupService extends AbstractDataService<ApiGroup, String, ApiGr
.where(qApiGroup.id.in(apiGroupIds)) .where(qApiGroup.id.in(apiGroupIds))
.fetch(); .fetch();
} }
/** API 를 지정한 그룹 목록에만 소속시킨다(기존 소속 제거 후 재설정). */
public void setApiGroupsForApi(String apiId, List<String> groupIds) {
deleteApiGroupApiByApiId(apiId);
if (groupIds == null) {
return;
}
for (String gid : groupIds) {
if (StringUtils.isBlank(gid)) {
continue;
}
ApiGroup group = repository.findById(gid).orElse(null);
if (group == null) {
continue;
}
Hibernate.initialize(group.getApiGroupApiList());
List<ApiGroupApi> list = group.getApiGroupApiList();
boolean exists = false;
for (ApiGroupApi a : list) {
if (a.getId() != null && apiId.equals(a.getId().getApiId())) {
exists = true;
break;
}
}
if (!exists) {
ApiGroupApi a = new ApiGroupApi();
a.setId(new ApiGroupApiId(gid, apiId));
a.setDisplayOrder(list.size() + 1);
list.add(a);
repository.save(group);
}
}
}
} }
@@ -0,0 +1,17 @@
package com.eactive.eai.rms.data.entity.onl.apim.messagerequest;
import com.eactive.apim.portal.template.entity.MessageRequest;
import com.eactive.eai.data.jpa.BaseRepository;
import com.eactive.eai.rms.data.EMSDataSource;
/**
* 발송 내역(PTL_MESSAGE_REQUEST) 조회용 admin 전용 리포지토리.
*
* <p>elink-portal-common 의 {@code template.repository.MessageRequestRepository}(JpaRepository) 와
* <b>단순 클래스명이 겹치면 Spring Data 빈 이름이 충돌</b>하므로(둘 다 admin 컨텍스트에 스캔됨)
* 이름을 분리한다. 또한 QueryDSL {@code findAll(predicate, pageable)} 를 쓰기 위해
* {@link BaseRepository} 를 상속한다.</p>
*/
@EMSDataSource
public interface MessageRequestEmsRepository extends BaseRepository<MessageRequest, String> {
}
@@ -0,0 +1,65 @@
package com.eactive.eai.rms.data.entity.onl.apim.messagerequest;
import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.apim.portal.template.entity.MessageRequest;
import com.eactive.apim.portal.template.entity.QMessageRequest;
import com.eactive.eai.rms.common.util.StringUtils;
import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce;
import com.eactive.eai.rms.onl.common.exception.BizException;
import com.querydsl.core.BooleanBuilder;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@Transactional(transactionManager = "transactionManagerForEMS")
public class MessageRequestService
extends AbstractEMSDataSerivce<MessageRequest, String, MessageRequestEmsRepository> {
public Page<MessageRequest> findAll(Pageable pageable, MessageRequestUISearch search) {
QMessageRequest q = QMessageRequest.messageRequest;
BooleanBuilder predicate = new BooleanBuilder();
if (StringUtils.isNotBlank(search.getSearchRequestStatus())) {
predicate.and(q.requestStatus.eq(search.getSearchRequestStatus()));
}
if (StringUtils.isNotBlank(search.getSearchMessageCode())) {
MessageCode.findServiceId(search.getSearchMessageCode())
.ifPresent(code -> predicate.and(q.messageCode.eq(code)));
}
if (StringUtils.isNotBlank(search.getSearchMessageType())) {
predicate.and(q.messageType.eq(search.getSearchMessageType()));
}
if (StringUtils.isNotBlank(search.getSearchRecipient())) {
predicate.and(q.username.containsIgnoreCase(search.getSearchRecipient()));
}
// requestDate 는 yyyyMMddHHmmss 14자리 문자열로 저장(LocalDateTimeToStringConverter14)되므로
// 고정폭 비교로 기간 필터가 동작한다.
if (search.getSearchFromDate() != null) {
predicate.and(q.requestDate.goe(search.getSearchFromDate().atStartOfDay()));
}
if (search.getSearchToDate() != null) {
predicate.and(q.requestDate.loe(search.getSearchToDate().atTime(23, 59, 59)));
}
// 발송요청 역순 고정 (Pageable 에 정렬이 없을 때의 안전장치)
Sort base = Sort.by(Sort.Direction.DESC, "requestDate");
Sort sort = pageable.getSort().isSorted() ? pageable.getSort() : base;
Pageable fixed = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort);
return repository.findAll(predicate, fixed);
}
/** PENDING 상태인 건만 FAILED 로 전환한다. */
public void updateStatusToFailedIfPending(String id) {
MessageRequest entity = getById(id);
if (!"PENDING".equals(entity.getRequestStatus())) {
throw new BizException("PENDING 상태인 건만 변경할 수 있습니다.");
}
entity.setRequestStatus("FAILED");
save(entity);
}
}
@@ -0,0 +1,29 @@
package com.eactive.eai.rms.data.entity.onl.apim.messagerequest;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
@Data
public class MessageRequestUISearch {
/* 발송 상태 (PENDING/SENT/FAILED) */
private String searchRequestStatus;
/* 메세지 코드 (MessageCode enum name) */
private String searchMessageCode;
/* 메세지 유형 (EMAIL/SMS 등) */
private String searchMessageType;
/* 수신자 이름 (MessageRequest.username 평문 컬럼 대상, LIKE 검색) */
private String searchRecipient;
/* 요청일시 기간 검색 (email/phone 은 암호화 저장이라 검색 제외) */
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate searchFromDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate searchToDate;
}
@@ -13,10 +13,16 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import java.util.List;
@Service @Service
@Transactional(transactionManager = "transactionManagerForEMS") @Transactional(transactionManager = "transactionManagerForEMS")
public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, String, PortalNoticeRepository> { public class PortalNoticeService extends AbstractEMSDataSerivce<PortalNotice, String, PortalNoticeRepository> {
public void deleteByIds(List<String> ids) {
repository.deleteAllById(ids);
}
public Page<PortalNotice> findAll(Pageable pageable, PortalNoticeUISearch portalNoticeUISearch) { public Page<PortalNotice> findAll(Pageable pageable, PortalNoticeUISearch portalNoticeUISearch) {
QPortalNotice qPortalNotice = QPortalNotice.portalNotice; QPortalNotice qPortalNotice = QPortalNotice.portalNotice;
@@ -10,10 +10,16 @@ import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service @Service
@Transactional(transactionManager = "transactionManagerForEMS") @Transactional(transactionManager = "transactionManagerForEMS")
public class PortalPartnershipService extends AbstractEMSDataSerivce<PartnershipApplication, String, PortalPartnershipRepository> { public class PortalPartnershipService extends AbstractEMSDataSerivce<PartnershipApplication, String, PortalPartnershipRepository> {
public void deleteByIds(List<String> ids) {
repository.deleteAllById(ids);
}
public Page<PartnershipApplication> findAll(Pageable pageable, String searchBizSubject, String searchBizDetail) { public Page<PartnershipApplication> findAll(Pageable pageable, String searchBizSubject, String searchBizDetail) {
QPartnershipApplication qPartnershipApplication = QPartnershipApplication.partnershipApplication; QPartnershipApplication qPartnershipApplication = QPartnershipApplication.partnershipApplication;
@@ -8,12 +8,14 @@ import com.eactive.apim.portal.template.entity.QMessageRequest;
import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce; import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.JPAExpressions;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional; import java.util.Optional;
@Service @Service
@@ -36,7 +38,22 @@ public class PortalUserService extends AbstractEMSDataSerivce<PortalUser, String
} }
if (StringUtils.isNotBlank(portalUserUISearch.getSearchUserId())) { if (StringUtils.isNotBlank(portalUserUISearch.getSearchUserId())) {
predicate.and(qPortalUser.loginId.containsIgnoreCase(portalUserUISearch.getSearchUserId())); // login_id / email_addr 는 PersonalDataEncryptConverter 로 암호화 저장되는 컬럼이다.
// 암호화는 부분문자열을 보존하지 않으므로 LIKE/contains 검색은 절대 매칭되지 않는다.
// 결정적(deterministic) 암호화라 정확일치(eq)만 가능하므로, login_id 와 email_addr 둘 다 정확일치로 OR 검색한다.
String searchUserId = portalUserUISearch.getSearchUserId().trim();
BooleanBuilder loginIdPredicate = new BooleanBuilder()
.or(qPortalUser.loginId.eq(searchUserId))
.or(qPortalUser.emailAddr.eq(searchUserId));
// 이메일 형식 값(예: user+1@unit-test.com)은 form-urlencoded 디코딩 과정에서
// '+' 가 공백으로 치환되어 전달될 수 있다(프록시/컨테이너 단계라 앱에서 인코딩만으로 막기 어려움).
// login_id/email 에는 공백이 올 수 없으므로, 공백 포함 검색어는 '+' 치환 값도 함께 매칭한다.
if (searchUserId.indexOf(' ') >= 0) {
String plusRestored = searchUserId.replace(' ', '+');
loginIdPredicate.or(qPortalUser.loginId.eq(plusRestored))
.or(qPortalUser.emailAddr.eq(plusRestored));
}
predicate.and(loginIdPredicate);
} }
if (StringUtils.isNotBlank(portalUserUISearch.getSearchUserName())) { if (StringUtils.isNotBlank(portalUserUISearch.getSearchUserName())) {
@@ -47,16 +64,49 @@ public class PortalUserService extends AbstractEMSDataSerivce<PortalUser, String
predicate.and(qPortalUser.portalOrg.id.eq(portalUserUISearch.getSearchOrgId())); predicate.and(qPortalUser.portalOrg.id.eq(portalUserUISearch.getSearchOrgId()));
} }
if (StringUtils.isNotBlank(portalUserUISearch.getSearchMobileNumber())) { if (StringUtils.isNotBlank(portalUserUISearch.getSearchMobileNumber())) {
predicate.and(qPortalUser.mobileNumber.contains(portalUserUISearch.getSearchMobileNumber())); // mobile_number 도 암호화 저장 컬럼이라 부분문자열이 보존되지 않는다.
// LIKE/contains 는 매칭되지 않으므로 정확일치(eq)로만 검색한다.
predicate.and(qPortalUser.mobileNumber.eq(portalUserUISearch.getSearchMobileNumber().trim()));
} }
if (StringUtils.isNotBlank(portalUserUISearch.getSearchRoleCode())) { if (StringUtils.isNotBlank(portalUserUISearch.getSearchRoleCode())) {
predicate.and(qPortalUser.roleCode.eq(PortalUserEnums.RoleCode.valueOf(portalUserUISearch.getSearchRoleCode()))); predicate.and(qPortalUser.roleCode.eq(PortalUserEnums.RoleCode.valueOf(portalUserUISearch.getSearchRoleCode())));
} }
// 휴대폰번호 중복(2명 이상 공유) 사용자만 조회
if (portalUserUISearch.isOnlyDuplicateMobile()) {
// 자바 리스트 .in() 은 컨버터가 IN 파라미터를 암호화하므로 레거시 평문 데이터와 매칭되지 않는다.
// 대신 서브쿼리 .in() 으로 컬럼 대 컬럼(SQL 내부) 비교를 하여 평문/암호문 저장 방식과 무관하게 동작시킨다.
QPortalUser dupUser = new QPortalUser("dupUser");
predicate.and(qPortalUser.mobileNumber.in(
JPAExpressions.select(dupUser.mobileNumber)
.from(dupUser)
.where(dupUser.mobileNumber.isNotNull()
.and(dupUser.userStatus.ne(PortalUserEnums.UserStatus.REMOVED)))
.groupBy(dupUser.mobileNumber)
.having(dupUser.count().gt(1L))));
}
return repository.findAll(predicate, pageable); return repository.findAll(predicate, pageable);
} }
/**
* 휴대폰번호가 중복되는 사용자 총 인원수(중복 그룹에 속한 사용자 수의 합)를 반환한다.
*/
public long countDuplicateMobileUsers() {
QPortalUser qPortalUser = QPortalUser.portalUser;
// Oracle 빈 문자열=NULL 이슈로 isNotNull 만 사용 (findDuplicateMobileNumbers 와 동일 기준)
List<Long> duplicateGroupCounts = getJPAQueryFactory()
.select(qPortalUser.count())
.from(qPortalUser)
.where(qPortalUser.mobileNumber.isNotNull()
.and(qPortalUser.userStatus.ne(PortalUserEnums.UserStatus.REMOVED)))
.groupBy(qPortalUser.mobileNumber)
.having(qPortalUser.count().gt(1L))
.fetch();
return duplicateGroupCounts.stream().mapToLong(Long::longValue).sum();
}
public boolean existsByLoginId(String loginId) { public boolean existsByLoginId(String loginId) {
BooleanExpression predicate = QPortalUser.portalUser.loginId.eq(loginId); BooleanExpression predicate = QPortalUser.portalUser.loginId.eq(loginId);
return repository.exists(predicate); return repository.exists(predicate);
@@ -77,6 +127,10 @@ public class PortalUserService extends AbstractEMSDataSerivce<PortalUser, String
} }
public PortalUser findByUserId(String userId) { public PortalUser findByUserId(String userId) {
if (StringUtils.isBlank(userId)) {
return null;
}
QPortalUser qPortalUser = QPortalUser.portalUser; QPortalUser qPortalUser = QPortalUser.portalUser;
return getJPAQueryFactory() return getJPAQueryFactory()
@@ -23,4 +23,7 @@ public class PortalUserUISearch {
private boolean includeRemoved; private boolean includeRemoved;
/** true 인 경우 휴대폰번호가 중복(2명 이상 공유)되는 사용자만 조회 */
private boolean onlyDuplicateMobile;
} }
@@ -5,7 +5,9 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -42,7 +44,12 @@ public class ExtendedColumnDefinitionService
predicate = predicate.and(qExtendedColumnDefinition.columnDesc.containsIgnoreCase(searchColumnDesc)); predicate = predicate.and(qExtendedColumnDefinition.columnDesc.containsIgnoreCase(searchColumnDesc));
} }
return repository.findAll(predicate, pageable); Pageable orderedPageable = PageRequest.of(
pageable.getPageNumber(),
pageable.getPageSize(),
Sort.by(Sort.Order.asc("orderSeq"), Sort.Order.asc("columnName")));
return repository.findAll(predicate, orderedPageable);
} }
} }
@@ -39,11 +39,10 @@ public interface ApiStatusRepository extends BaseRepository<ApiStatus, String> {
+ " FROM (" + " FROM ("
+ " SELECT A.EAISVCNAME" + " SELECT A.EAISVCNAME"
+ " , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE" + " , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE"
//TODO: 게시판 임시로 생성하여 사용. 유차장이 완료하면 변경할것 + " , NVL(( SELECT MAX('Y') FROM EMSAPP.DJB_APISTATUS_INCIDENT_API X"
+ " , NVL(( SELECT 'Y' FROM PTL_NOTICE_API X " + " WHERE EXISTS (SELECT 1 FROM EMSAPP.DJB_APISTATUS_INCIDENT Y WHERE X.INCIDENT_ID = Y.INCIDENT_ID "
+ " WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID)" + " AND SYSTIMESTAMP BETWEEN STARTED_AT AND END_AT) "
//+ " AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) " + " AND A.EAISVCNAME = X.API_ID),'N') AS CTRL_YN "
+ " AND A.EAISVCNAME = X.API_NAME),'N') AS CTRL_YN "
+ " , (SELECT CASE WHEN TOTAL = 0 THEN 'X'" + " , (SELECT CASE WHEN TOTAL = 0 THEN 'X'"
+ " WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'" + " WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'"
+ " ELSE 'N' END" + " ELSE 'N' END"
@@ -15,7 +15,7 @@ import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.man.role.Role;
import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus;
import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent;
import com.eactive.eai.rms.ext.djb.util.UmsManager; import com.eactive.eai.rms.ext.djb.ums.UmsManager;
@Service @Service
@@ -26,10 +26,10 @@ public class ApiStatusService {
@Autowired @Autowired
private ApiStatusRepository apiStatusRepository; private ApiStatusRepository apiStatusRepository;
@Autowired @Autowired
private UmsManager ums; private UmsManager ums;
@Autowired @Autowired
private ApiStatusDetectionService apiStatusDectionService; private ApiStatusDetectionService apiStatusDectionService;
@@ -55,7 +55,8 @@ public class ApiStatusService {
apiStatus.setEaisvcname(event.getEaisvcname()); apiStatus.setEaisvcname(event.getEaisvcname());
apiStatus.setStatusCode(newStatusCode); apiStatus.setStatusCode(newStatusCode);
apiStatusRepository.save(apiStatus); // PK 있으면 UPDATE, 없으면 INSERT apiStatusRepository.saveAndFlush(apiStatus); // PK 있으면 UPDATE, 없으면 INSERT (즉시 flush)
log.debug("API 상태 변경: {}-{} {} → {}", event.getEaisvcname(), event.getEaisvcdesc(), event.getEvent(), newStatusCode); log.debug("API 상태 변경: {}-{} {} → {}", event.getEaisvcname(), event.getEaisvcdesc(), event.getEvent(), newStatusCode);
@@ -75,8 +76,8 @@ public class ApiStatusService {
String event = entry.getKey(); String event = entry.getKey();
List<String> apiIds = entry.getValue(); List<String> apiIds = entry.getValue();
String message = getSwingChatMessage(event, apiIds); HashMap<String, Object> params = getSwingChatMessage(event, apiIds);
ums.sendMessenger("api-monitor", MessageCode.API_STATUS_CHANGED, message); ums.send("api-monitor", MessageCode.API_STATUS_CHANGED, params);
//제휴사 웹훅 발송 //제휴사 웹훅 발송
ums.sendWebhook(event, apiIds); ums.sendWebhook(event, apiIds);
@@ -102,7 +103,7 @@ public class ApiStatusService {
} }
private String getSwingChatMessage(String event, List<String> apiIds) { private HashMap<String, Object> getSwingChatMessage(String event, List<String> apiIds) {
String message = ""; String message = "";
switch (event) { switch (event) {
case "CONTROL_START": case "CONTROL_START":
@@ -125,9 +126,18 @@ public class ApiStatusService {
break; break;
default: default:
message = ""; message = "";
} }
return message + "\n- " + String.join(",", apiIds); if (apiIds.size() > 1) {
message += "\n" + apiIds.get(0) + "" + (apiIds.size()-1) + "";
} else {
message += "\n- " + apiIds.get(0);
}
HashMap<String, Object> params = new HashMap<>();
params.put("message", message);
return params;
} }
} }
@@ -1,5 +1,6 @@
package com.eactive.eai.rms.ext.djb.inflow; package com.eactive.eai.rms.ext.djb.inflow;
import java.util.HashMap;
import java.util.List; import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -9,9 +10,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.eactive.apim.portal.template.entity.MessageCode; import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.eai.rms.data.entity.man.role.Role;
import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficient; import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficient;
import com.eactive.eai.rms.ext.djb.util.UmsManager; import com.eactive.eai.rms.ext.djb.ums.UmsManager;
@Service @Service
@@ -31,9 +31,10 @@ public class InflowTokenService {
for (InflowTokenInsufficient info : rows) { for (InflowTokenInsufficient info : rows) {
log.debug("유량제어 토큰 획득 실패: {}-{} 최근 {}분 동안 {}건", info.getEaisvcname(), info.getEaisvcdesc(), rangeMinute, info.getCnt()); log.debug("유량제어 토큰 획득 실패: {}-{} 최근 {}분 동안 {}건", info.getEaisvcname(), info.getEaisvcdesc(), rangeMinute, info.getCnt());
String message = "유량제어 토큰 획득 실패하였습니다 \n" + info.getEaisvcname(); String message = "유량제어 토큰 획득 실패가 발생하였습니다 \n" + info.getEaisvcname();
HashMap<String,Object> params = new HashMap<String,Object>();
ums.sendMessenger("api-monitor", MessageCode.INFLOW_TOKEN_FAILED, message); params.put("message", message);
ums.send("api-monitor", MessageCode.INFLOW_TOKEN_FAILED, params);
} }
} }
} }
@@ -1,6 +1,9 @@
package com.eactive.eai.rms.ext.djb.job; package com.eactive.eai.rms.ext.djb.job;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.quartz.DisallowConcurrentExecution; import org.quartz.DisallowConcurrentExecution;
@@ -68,10 +71,24 @@ public class ApiStatusMonitorJob implements Job {
@Override @Override
public void execute(JobExecutionContext context) throws JobExecutionException { public void execute(JobExecutionContext context) throws JobExecutionException {
JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
// execute.instances 가 지정된 경우 해당 인스턴스에서만 실행
String allowedInstances = jobDataMap.getString("execute.instances");
if (StringUtils.isNotEmpty(allowedInstances)) {
Set<String> instanceSet = Arrays.stream(allowedInstances.split(","))
.map(s -> s.trim().toLowerCase())
.collect(Collectors.toSet());
String currentInstance = StringUtils.defaultString(System.getProperty("inst.Name")).trim().toLowerCase();
if (!instanceSet.contains(currentInstance)) {
log.debug("Job 실행 인스턴스 제한 - 현재: {}, 허용: {}", currentInstance, allowedInstances);
return;
}
}
log.info("*** START ApiStatusUpdateJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm")); log.info("*** START ApiStatusUpdateJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm"));
// Job 파라미터 로깅 // Job 파라미터 로깅
JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
logJobParameters(jobDataMap); logJobParameters(jobDataMap);
HashMap<String, String> param = this.checkParameters(jobDataMap); HashMap<String, String> param = this.checkParameters(jobDataMap);
@@ -1,8 +1,12 @@
package com.eactive.eai.rms.ext.djb.job; package com.eactive.eai.rms.ext.djb.job;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.quartz.DisallowConcurrentExecution; import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job; import org.quartz.Job;
import org.quartz.JobDataMap; import org.quartz.JobDataMap;
@@ -48,6 +52,21 @@ public class InflowTokenMonitorJob implements Job {
@Override @Override
public void execute(JobExecutionContext context) throws JobExecutionException { public void execute(JobExecutionContext context) throws JobExecutionException {
JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
// execute.instances 가 지정된 경우 해당 인스턴스에서만 실행
String allowedInstances = jobDataMap.getString("execute.instances");
if (StringUtils.isNotEmpty(allowedInstances)) {
Set<String> instanceSet = Arrays.stream(allowedInstances.split(","))
.map(s -> s.trim().toLowerCase())
.collect(Collectors.toSet());
String currentInstance = StringUtils.defaultString(System.getProperty("inst.Name")).trim().toLowerCase();
if (!instanceSet.contains(currentInstance)) {
log.debug("Job 실행 인스턴스 제한 - 현재: {}, 허용: {}", currentInstance, allowedInstances);
return;
}
}
log.info("*** START InflowTokenFailMonitorJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm")); log.info("*** START InflowTokenFailMonitorJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm"));
long execMinute = 1; //default 배치 실행주기(분) long execMinute = 1; //default 배치 실행주기(분)
@@ -5,13 +5,20 @@ import com.eactive.eai.rms.common.datasource.DataSourceTypeManager;
import com.eactive.eai.rms.common.util.CommonUtil; import com.eactive.eai.rms.common.util.CommonUtil;
import com.eactive.eai.rms.onl.apim.portalInquiry.PortalInquiryClosingService; import com.eactive.eai.rms.onl.apim.portalInquiry.PortalInquiryClosingService;
import com.eactive.eai.rms.onl.common.util.DateUtil; import com.eactive.eai.rms.onl.common.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.quartz.DisallowConcurrentExecution; import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job; import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException; import org.quartz.JobExecutionException;
import org.quartz.SchedulerException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext;
import java.util.Arrays;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* 매일 00:05 실행 - RESPONDED 상태 문의글 자동 종료 배치 * 매일 00:05 실행 - RESPONDED 상태 문의글 자동 종료 배치
@@ -39,13 +46,34 @@ public class PortalInquiryClosingJob implements Job {
private static final int DEFAULT_CLOSING_DAYS = 7; private static final int DEFAULT_CLOSING_DAYS = 7;
@Autowired
private PortalInquiryClosingService inquiryCommentClosingService;
@Override @Override
public void execute(JobExecutionContext context) throws JobExecutionException { public void execute(JobExecutionContext context) throws JobExecutionException {
JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
// execute.instances 가 지정된 경우 해당 인스턴스에서만 실행
String allowedInstances = jobDataMap.getString("execute.instances");
if (StringUtils.isNotEmpty(allowedInstances)) {
Set<String> instanceSet = Arrays.stream(allowedInstances.split(","))
.map(s -> s.trim().toLowerCase())
.collect(Collectors.toSet());
String currentInstance = StringUtils.defaultString(System.getProperty("inst.Name")).trim().toLowerCase();
if (!instanceSet.contains(currentInstance)) {
log.debug("Job 실행 인스턴스 제한 - 현재: {}, 허용: {}", currentInstance, allowedInstances);
return;
}
}
log.info("*** START PortalInquiryCommentClosingService run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm")); log.info("*** START PortalInquiryCommentClosingService run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm"));
PortalInquiryClosingService service;
try {
ApplicationContext appContext = (ApplicationContext) context.getScheduler().getContext().get("applicationContext");
service = appContext.getBean(PortalInquiryClosingService.class);
} catch (SchedulerException e) {
log.error("applicationContext 조회 실패", e);
throw new JobExecutionException(e);
}
int closingDays = DEFAULT_CLOSING_DAYS; int closingDays = DEFAULT_CLOSING_DAYS;
String closingDayParam = context.getMergedJobDataMap().getString(KEY_INQUIRY_COMMENT_CLOSING_DAY); String closingDayParam = context.getMergedJobDataMap().getString(KEY_INQUIRY_COMMENT_CLOSING_DAY);
if (closingDayParam != null) { if (closingDayParam != null) {
@@ -59,7 +87,7 @@ public class PortalInquiryClosingJob implements Job {
DataSourceContextHolder.setDataSourceType( DataSourceContextHolder.setDataSourceType(
DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW)); DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW));
try { try {
int closedCount = inquiryCommentClosingService.closeExpiredInquiries(closingDays); int closedCount = service.closeExpiredInquiries(closingDays);
log.info("PortalInquiryCommentClosingService 완료: {}건 CLOSED 처리", closedCount); log.info("PortalInquiryCommentClosingService 완료: {}건 CLOSED 처리", closedCount);
} catch (Exception e) { } catch (Exception e) {
log.error("PortalInquiryCommentClosingService execution failed", e); log.error("PortalInquiryCommentClosingService execution failed", e);
@@ -85,7 +85,7 @@ public class ApiUseStatsService
+ " ORDER BY ORGNAME"; + " ORDER BY ORGNAME";
} else if ("API".equals(search.getSearchType())) { } else if ("API".equals(search.getSearchType())) {
dataSql = "SELECT COUNT(*) OVER () AS RECORDS " dataSql = "SELECT COUNT(*) OVER () AS RECORDS "
+ ", C.EAISVCDESC" + ", A.API_NAME"
+ ", SUM(A.TOTAL_CNT)" + ", SUM(A.TOTAL_CNT)"
+ ", SUM(A.SUCCESS_CNT)" + ", SUM(A.SUCCESS_CNT)"
+ ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN SUM(A.SUCCESS_CNT) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END" + ", CASE WHEN SUM(A.TOTAL_CNT) > 0 THEN SUM(A.SUCCESS_CNT) * 100 / SUM(A.TOTAL_CNT) ELSE NULL END"
@@ -99,8 +99,8 @@ public class ApiUseStatsService
+ " LEFT OUTER JOIN TSEAIAU01 B ON A.CLIENT_ID = B.CLIENTID" + " LEFT OUTER JOIN TSEAIAU01 B ON A.CLIENT_ID = B.CLIENTID"
+ " LEFT OUTER JOIN TSEAIHE01 C ON A.API_NAME = C.EAISVCNAME " + " LEFT OUTER JOIN TSEAIHE01 C ON A.API_NAME = C.EAISVCNAME "
+ where + where
+ " GROUP BY C.EAISVCDESC" + " GROUP BY A.API_NAME"
+ " ORDER BY EAISVCDESC"; + " ORDER BY API_NAME";
} else if ("DATE".equals(search.getSearchType())) { } else if ("DATE".equals(search.getSearchType())) {
dataSql = "SELECT COUNT(*) OVER () AS RECORDS " dataSql = "SELECT COUNT(*) OVER () AS RECORDS "
+ ", TO_CHAR(STAT_TIME,'YYYY-MM-DD') AS STAT_TIME " + ", TO_CHAR(STAT_TIME,'YYYY-MM-DD') AS STAT_TIME "
@@ -1,4 +1,4 @@
package com.eactive.eai.rms.ext.djb.util; package com.eactive.eai.rms.ext.djb.ums;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -29,14 +29,13 @@ public class UmsManager {
private final WebhookService webhookService; private final WebhookService webhookService;
/** /**
* role 역할을 가진 내부직원에게 메신저(Swing chat) 발송 * roleId에 해당하는 역할을 가진 직원에게 UMS(sms,email,messenger) 발송
* @param role * @param role
* @param messageCode * @param messageCode
* @param message * @param params
* @return * @return
*/ */
public void sendMessenger(String roleId, MessageCode messageCode, String message) { public void send(String roleId, MessageCode messageCode, HashMap<String, Object> params) {
List<UserInfo> users = userInfoService.findAllByRoleId(roleId); List<UserInfo> users = userInfoService.findAllByRoleId(roleId);
if (users.isEmpty()) { if (users.isEmpty()) {
log.info("sendMessenger: no users found for role '{}'", roleId); log.info("sendMessenger: no users found for role '{}'", roleId);
@@ -44,36 +43,36 @@ public class UmsManager {
} }
for (UserInfo user : users) { for (UserInfo user : users) {
String cleanedPhone = user.getCphnno().replaceAll("[^0-9]", "").trim();
MessageRecipient recipient = MessageRecipient.builder() MessageRecipient recipient = MessageRecipient.builder()
.userId(user.getUserid()) .userId(user.getUserid())
.username(user.getUsername()) .username(user.getUsername())
.email(user.getEmad())
.phone(cleanedPhone)
.messengerId(user.getUserid())
.build(); .build();
HashMap<String, Object> params = new HashMap<>();
params.put("message", message);
messageHandlerService.publishEvent(messageCode, recipient, params); messageHandlerService.publishEvent(messageCode, recipient, params);
} }
} }
/** /**
* 내부직원에게 메신저 발송 * 직원 또는 회원에게 UMS(sms,email,messenger) 발송
* @param user * @param user
* @param messageCode * @param messageCode
* @param message * @param params
*/ */
public void sendMessenger(UserInfo user, MessageCode messageCode, String message) { public void send(UserInfo user, MessageCode messageCode, HashMap<String, Object> params) {
String cleanedPhone = user.getCphnno().replaceAll("[^0-9]", "").trim();
MessageRecipient recipient = MessageRecipient.builder() MessageRecipient recipient = MessageRecipient.builder()
.userId(user.getUserid()) .userId(user.getUserid())
.username(user.getUsername()) .username(user.getUsername())
.email(user.getEmad())
.phone(cleanedPhone)
.messengerId(user.getUserid())
.build(); .build();
HashMap<String, Object> params = new HashMap<>();
params.put("message", message);
messageHandlerService.publishEvent(messageCode, recipient, params); messageHandlerService.publishEvent(messageCode, recipient, params);
} }
/** /**
* event를 구독중인 제휴사에게 웹훅 발송 (비동기) * event를 구독중인 제휴사에게 웹훅 발송 (비동기)
* @param event * @param event
@@ -0,0 +1,47 @@
package com.eactive.eai.rms.ext.djb.ums.event;
import java.util.HashMap;
import java.util.Map;
import org.springframework.stereotype.Component;
import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.apim.portal.template.service.MessageEventHandler;
import com.eactive.apim.portal.template.service.MessageRecipient;
import com.eactive.apim.portal.template.service.MessageSendEvent;
@Component
public class AdminVerificationMobilePhoneEventHandler implements MessageEventHandler {
@Override
public MessageCode getKey() {
return MessageCode.ADMIN_VERIFICATION_MOBILEPHONE;
}
@Override
public boolean allowAdditionalRecipients() {
return false;
}
@Override
public String getDisplayName() {
return "관리자포탈 휴대폰 인증번호 발송";
}
@Override
public String getDescription() {
return "<div>사용 가능 변수: </div><br/>"
+ "<div> - userName 수신자 이름 </div><br/>"
+ "<div> - authNumber 인증번호 </div><br/>";
}
@Override
public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
Map<String, String> eventParams = new HashMap<>();
String authNumber = (String) params.get("authNumber");
eventParams.put("authNumber", authNumber);
eventParams.put("AUTH_CODE", authNumber);
eventParams.put("userName", (String) params.get("userName"));
return new MessageSendEvent(source, MessageCode.ADMIN_VERIFICATION_MOBILEPHONE, recipient, eventParams);
}
}
@@ -0,0 +1,43 @@
package com.eactive.eai.rms.ext.djb.ums.event;
import java.util.HashMap;
import java.util.Map;
import org.springframework.stereotype.Component;
import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.apim.portal.template.service.MessageEventHandler;
import com.eactive.apim.portal.template.service.MessageRecipient;
import com.eactive.apim.portal.template.service.MessageSendEvent;
@Component
public class ApiStatusChangedEventHandler implements MessageEventHandler {
@Override
public MessageCode getKey() {
return MessageCode.API_STATUS_CHANGED;
}
@Override
public boolean allowAdditionalRecipients() {
return true;
}
@Override
public String getDisplayName() {
return "API 상태 변화";
}
@Override
public String getDescription() {
return "<div>사용 가능 변수: </div><br/>"
+ "<div> - message 알림 메시지 </div><br/>";
}
@Override
public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
Map<String, String> eventParams = new HashMap<>();
eventParams.put("message", (String) params.get("message"));
return new MessageSendEvent(source, MessageCode.API_STATUS_CHANGED, recipient, eventParams);
}
}
@@ -0,0 +1,43 @@
package com.eactive.eai.rms.ext.djb.ums.event;
import java.util.HashMap;
import java.util.Map;
import org.springframework.stereotype.Component;
import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.apim.portal.template.service.MessageEventHandler;
import com.eactive.apim.portal.template.service.MessageRecipient;
import com.eactive.apim.portal.template.service.MessageSendEvent;
@Component
public class InflowTokenFailedEventHandler implements MessageEventHandler {
@Override
public MessageCode getKey() {
return MessageCode.INFLOW_TOKEN_FAILED;
}
@Override
public boolean allowAdditionalRecipients() {
return true;
}
@Override
public String getDisplayName() {
return "유량제어 토큰 획득 실패";
}
@Override
public String getDescription() {
return "<div>사용 가능 변수: </div><br/>"
+ "<div> - message 알림 메시지 </div><br/>";
}
@Override
public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
Map<String, String> eventParams = new HashMap<>();
eventParams.put("message", (String) params.get("message"));
return new MessageSendEvent(source, MessageCode.INFLOW_TOKEN_FAILED, recipient, eventParams);
}
}
@@ -0,0 +1,337 @@
package com.eactive.eai.rms.ext.djb.ums.service;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.Charset;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Service;
import com.eactive.apim.portal.common.util.PhoneNumberUtil;
import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
import com.eactive.apim.portal.template.entity.MessageRequest;
import com.eactive.eai.common.util.SystemUtil;
import com.eactive.eai.rms.data.entity.man.monitoringProperty.service.MonitoringPropertyService;
import com.eactive.eai.rms.ext.djb.ums.vo.EmailDataVO;
import com.eactive.eai.rms.ext.djb.ums.vo.SmsDataVO;
import com.eactive.eai.rms.ext.djb.ums.vo.StdHeadVO;
import com.eactive.eai.rms.ext.djb.ums.vo.SwingCommonVO;
import com.eactive.eai.rms.ext.djb.ums.vo.SwingDataVO;
import com.eactive.eai.rms.ext.djb.ums.vo.SwingReceiverDataVO;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
public class UmsService {
private static final Gson gson = new Gson();
private static final String SYS_DVCD = "API"; //시스템코드
private static final String BZWK_DVCD = "99"; //업무구분코드
private static final String SUB_BZWK_CD = "9019"; //세부구분코드
private final MonitoringPropertyService propertyService;
public UmsService(MonitoringPropertyService propertyService) {
this.propertyService = propertyService;
}
public boolean send(MessageRequest messageRequest) throws Exception {
if (messageRequest == null) {
throw new IllegalArgumentException("messageRequest is null");
}
this.httpConnection(messageRequest);
return true;
}
private void httpConnection(MessageRequest messageRequest) throws Exception {
HttpURLConnection conn = null;
BufferedReader br = null;
log.debug("<<<HTTP Connection>>>:" + messageRequest.toString());
try {
String host = propertyService.getPropertyValue("Monitoring", "djb.ums."+messageRequest.getMessageType().toLowerCase()+".url", "");
URL url = new URL(host);
int timeoutValue = 5 * 1000; // 타임아웃 설정을 위한 (단위: ms)
// Charset charset = Charset.forName("UTF-8");
Charset charset = Charset.forName("MS949");
StringBuffer sb = null;
String bodyData = this.makeBodyData(messageRequest);
String responseData = "";
String method = bodyData.isEmpty() ? "GET" : "POST";
conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod(method); // 전송방식
// conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
conn.setRequestProperty("Content-Type", "application/json; charset=MS949");
conn.setConnectTimeout(timeoutValue); // 연결 타임아웃 설정(5초)
conn.setReadTimeout(timeoutValue); // 읽기 타임아웃 설정(5초)
conn.setDoOutput(true);
// POst 방식인 경우에만
if (method.equals("POST")) {
OutputStream os = conn.getOutputStream();
byte requestData[] = bodyData.getBytes(charset);
os.write(requestData);
os.close();
}
if (log.isDebugEnabled()) {
log.debug("getContentType();" + conn.getContentType()); // 응답 콘텐츠 유형 구하기
log.debug("getResponsecode();" + conn.getResponseCode()); // 응답 코드 구하기
log.debug("getResponseMessage():" + conn.getResponseMessage()); // 응답 메세지 구하기
}
// http 요청 응답 받은 데이타를 버퍼에 쌓는다
if (conn.getResponseCode() >= 200 && conn.getResponseCode() <= 300) {
br = new BufferedReader(new InputStreamReader(conn.getInputStream(), charset));
} else {
br = new BufferedReader(new InputStreamReader(conn.getErrorStream(), charset));
}
String inputLine;
sb = new StringBuffer();
while ((inputLine = br.readLine()) != null) {
sb.append(inputLine);
}
responseData = sb.toString();
} finally {
// http 요청 응답 완료 BufferedReader를 닫는다
if (br != null) {
br.close();
}
if (conn != null) {
conn.disconnect();
}
}
}
private String makeBodyData(MessageRequest messageRequest) {
// 리턴값
String rtnVal = "";
// guID 날짜 시간 정보
String jsonData[] = this.makeStdGuidInfo();
// 표준 헤더
StdHeadVO stdHeadVO = new StdHeadVO();
stdHeadVO.setNxgn_stnd_idfr("JERA");
stdHeadVO.setGuid(jsonData[2]);
stdHeadVO.setGuid_prgs_no("1");
stdHeadVO.setStnd_mesg_ver("R10");
stdHeadVO.setOrtr_guid(jsonData[2]);
stdHeadVO.setSect_ecrpt_yn("N");
stdHeadVO.setFrst_trnm_ipad(propertyService.getPropertyValue("Monitoring", "djb.ums.was_ip_address", ""));
stdHeadVO.setFrst_trnm_ipv4_addr(propertyService.getPropertyValue("Monitoring", "djb.ums.was_ip_address", ""));
stdHeadVO.setFrst_trnm_mac(propertyService.getPropertyValue("Monitoring", "djb.ums.was_mac_address", ""));
stdHeadVO.setFrst_mesg_dman_dt(jsonData[0]);
stdHeadVO.setFrst_mesg_dman_time(jsonData[1]);
stdHeadVO.setFrst_trnm_sys_dvcd(SYS_DVCD);
stdHeadVO.setTrnm_sys_dvcd(SYS_DVCD);
stdHeadVO.setDman_rspn_dvcd("S"); // 요청응답구분코드 S:요청 R:응답
stdHeadVO.setSys_env_dvcd(SystemUtil.getSysOperEvirnDstcd()); // D:개발 T:테스트 P:운영
stdHeadVO.setTx_tycd("O"); // O:온라인 B:배치
stdHeadVO.setSynz_dvcd("S"); // S:동기 A:비동기
stdHeadVO.setChnl_tycd("EAI"); // 채널유형코드
stdHeadVO.setHmab_dvcd("1"); // 내외구분코드 1:내부 2:외부(타발)
stdHeadVO.setIf_id(messageRequest.getEaiInterfaceId()); // 인터페이스ID
stdHeadVO.setTx_id(messageRequest.getServiceId()); // 거래ID
if ("MESSENGER".equals(messageRequest.getMessageType()) ) {
stdHeadVO.setChnl_tycd("FEP"); // 채널유형코드
// 스윙챗 알림 공용
SwingCommonVO swiComVO = new SwingCommonVO();
swiComVO.setClientld(propertyService.getPropertyValue("Monitoring", "djb.ums.messenger.client_id", ""));
swiComVO.setClientSecret(propertyService.getPropertyValue("Monitoring", "djb.ums.messenger.client_secret", ""));
swiComVO.setCompanyCode("CB");
swiComVO.setRequestUniqueKey(this.genrateRandomStringNumber26());
// 스윙챗 알림 데이터
SwingDataVO swiDataVO = new SwingDataVO();
swiDataVO.setNotiCode("CNO_FEP_HMP_0002");
swiDataVO.setNotiTitle("알림");
swiDataVO.setNotiContent(messageRequest.getMessage());
// 스윙챗 알림 데이터
List<SwingReceiverDataVO> swiReDataVOList = new ArrayList<SwingReceiverDataVO>();
SwingReceiverDataVO receiver = new SwingReceiverDataVO();
receiver.setType("");
receiver.setCompanyCode("CB");
receiver.setCode(messageRequest.getMessengerId());
receiver.setPrdNm("");
swiReDataVOList.add(receiver);
swiDataVO.setReceiverInfo(swiReDataVOList);
String header = gson.toJson(stdHeadVO);
String common = gson.toJson(swiComVO);
String data = gson.toJson(swiDataVO);
// 헤더 + 데이터
rtnVal = "{\"HEAD\":" + header + " ,\r\n" + "\"DATA\":\r\n" + " [" + "{\r\n"
+ " \"data_dvcd\":\"IO\", \r\n" + " \"BIZ_DATA\":\r\n" + " {\r\n"
+ " \"common\":\r\n" + common + ",\r\n" + " \"data\":" + data
+ " }\r\n" + " }\r\n" + " ]\r\n" + "}";
}
else if ("SMS".equals(messageRequest.getMessageType())
|| "KAKAO".equals(messageRequest.getMessageType())) {
// Sms 데이터
SmsDataVO dataVO = new SmsDataVO();
dataVO.setSnd_dman_dt(jsonData[0]);
dataVO.setSnd_dman_id("");
dataVO.setSnd_dvcd("EAI");
dataVO.setMsg_titl("");
dataVO.setMsg_ctnt(messageRequest.getMessage());
dataVO.setRecvr_no(PhoneNumberUtil.digitsOnly(messageRequest.getPhone()));
dataVO.setSndn_no("15880079"); //발신번호
dataVO.setSnd_empno(""); //요청자
dataVO.setSnd_emp_dprm_cd(""); //요청부서코드
if ("SMS".equals(messageRequest.getMessageType())) {
dataVO.setLtrs_snd_tycd("1"); // 1:SMS 2:LMS/MMS
dataVO.setMsg_snd_tycd("0000"); // 알림톡 메세지 종류 0000:SMS, 1000:LMS, 1008:알림톡, ....
} else if ("KAKAO".equals(messageRequest.getMessageType())) {
dataVO.setLtrs_snd_tycd("2"); // 1:SMS 2:LMS/MMS
dataVO.setMsg_snd_tycd("1008"); // 알림톡 메세지 종류 0000:SMS, 1000:LMS, 1008:알림톡, ....
dataVO.setAlmtk_snd_prfl_key(""); // 플러스친구아이디
dataVO.setAlmtk_tmplt_cd(""); // 템플릿코드
dataVO.setAlmtk_err_ltrs_snd_yn("Y"); // 오류자문자발송여부
dataVO.setAlmtk_btn_trnm_tycd("2"); // 카카오버튼전송방식 1-format string 2-JSON 3-XML
}
dataVO.setSms_trnm_bzwk_dvcd(BZWK_DVCD); //업무구분코드
dataVO.setSms_bzwk_dcls_dvcd(SUB_BZWK_CD); //업무세분코드
dataVO.setSms_sys_dvcd("83"); //시스템코드
dataVO.setTx_dt(jsonData[0]); //거래일자
dataVO.setTx_tktm(jsonData[1].substring(0,6)); //거래시간
List<SmsDataVO> dataList = new ArrayList<SmsDataVO>();
dataList.add(dataVO);
String header = gson.toJson(stdHeadVO);
String data = gson.toJson(dataList);
// 헤더 + 데이터
rtnVal = "{\"HEAD\":" + header + " ,\r\n" + "\"DATA\":\r\n" + " [" + "{\r\n"
+ " \"data_dvcd\":\"IO\", \r\n" + " \"BIZ_DATA\":\r\n" + " {\r\n"
+ " \"ums_if_data_ncnt\":1, \r\n"
+ " \"ums_if_data\":" + data
+ " }\r\n" + " }\r\n" + " ]\r\n" + "}";
}
else if ("EMAIL".equals(messageRequest.getMessageType())) {
// 이메일 데이터
EmailDataVO dataVO = new EmailDataVO();
dataVO.setUms_evnt_id(""); // UMS이벤트ID(필수)
dataVO.setSnd_dman_dt(jsonData[0]);
dataVO.setSnd_dman_id("");
dataVO.setSnd_dman_sno("1");
dataVO.setEmail_titl(messageRequest.getSubject()); // 메일제목
dataVO.setCstno(""); // 고객번호(필수)
dataVO.setSendr_emaddr(""); // 발신자 이메일
dataVO.setSendr_nm(""); // 발신자 이름
dataVO.setSndbk_emaddr(""); // 리턴 이메일
dataVO.setRecvr_emaddr(messageRequest.getEmail()); // 수신자 이메일(필수)
dataVO.setRecvr_nm(messageRequest.getUsername()); // 수신자명(필수)
dataVO.setTmplt_mpng_info(messageRequest.getMessage()); // 탬플릿매핑정보
dataVO.setTmplt_mpng_rptt_info(""); // 탬플릿매핑반복정보
dataVO.setSnd_empno(""); // 발신자ID(필수)
dataVO.setSnd_emp_dprm_cd(""); // 발신자부서코드(필수)
dataVO.setBzwk_cd(BZWK_DVCD); // 업무구분코드
dataVO.setSub_bzwk_cd(SUB_BZWK_CD); // 업무세부코드
dataVO.setSys_dvcd(SYS_DVCD);
dataVO.setTx_dt(jsonData[0]); //거래일자
dataVO.setTx_tktm(jsonData[1].substring(0,6)); //거래시간
List<EmailDataVO> dataList = new ArrayList<EmailDataVO>();
dataList.add(dataVO);
String header = gson.toJson(stdHeadVO);
String data = gson.toJson(dataList);
// 헤더 + 데이터
rtnVal = "{\"HEAD\":" + header + " ,\r\n" + "\"DATA\":\r\n" + " [" + "{\r\n"
+ " \"data_dvcd\":\"IO\", \r\n" + " \"BIZ_DATA\":\r\n" + " {\r\n"
+ " \"ums_if_data_ncnt\":1, \r\n"
+ " \"ums_if_data\":" + data
+ " }\r\n" + " }\r\n" + " ]\r\n" + "}";
}
log.debug(rtnVal);
return rtnVal;
}
private String[] makeStdGuidInfo() {
// 리턴값
String rtnVal[] = new String[3];
// 현재시간
Date currentDate = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String formattedDate = sdf.format(currentDate);
rtnVal[0] = formattedDate.substring(0,8);
rtnVal[1] = formattedDate.substring(8);
// 랜던값
String random20 = this.genrateRandomStringNumber20();
rtnVal[2] = formattedDate + SYS_DVCD + random20;
return rtnVal;
}
private String genrateRandomStringNumber20() {
String rtnVal= "";
StringBuilder buffer= new StringBuilder(10);
// 랜덤값
String characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
// 랜덤객체 생성
SecureRandom random = new SecureRandom();
// 반복문
for (int i= 0;i< 10;i++) {
// 랜덤수
int randomIndex = random.nextInt(characters.length());
// 생성된 랜덤값
char randomChar = characters.charAt(randomIndex);
// 랜덤값 저장
buffer.append(randomChar);
}
// 랜덤객체 재생성
random = new SecureRandom();
// 난수 10개 생성
int random10 = (int) (Math.pow(10, 9) + random.nextDouble() * Math.pow(10, 9));
// 문자 숫자 조합(10) + 숫자(10)
rtnVal = buffer.toString() + Integer.toString(random10);
return rtnVal;
}
private String genrateRandomStringNumber26() {
StringBuilder buffer = new StringBuilder(26);
String characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ0123456789";
SecureRandom random = new SecureRandom();
for (int i = 0; i < 26; i++) {
buffer.append(characters.charAt(random.nextInt(characters.length())));
}
return buffer.toString();
}
}
@@ -0,0 +1,67 @@
package com.eactive.eai.rms.ext.djb.ums.vo;
import lombok.Data;
@Data
public class EmailDataVO {
/** UMS이벤트ID */
private String ums_evnt_id;
/** 발송요청일자 */
private String snd_dman_dt;
/** UUID */
private String snd_dman_id;
/** 발송요청순번 */
private String snd_dman_sno;
/** 메일제목 */
private String email_titl;
/** 고객번호 */
private String cstno;
/** 발신자 이메일 */
private String sendr_emaddr;
/** 발신자 이름 */
private String sendr_nm;
/** 리턴 이메일 */
private String sndbk_emaddr;
/** 수신자 이메일 */
private String recvr_emaddr;
/** 수신자명 */
private String recvr_nm;
/** 탬플릿매핑정보 */
private String tmplt_mpng_info;
/** 탬플릿매핑반복정보 */
private String tmplt_mpng_rptt_info;
/** 발신자ID */
private String snd_empno;
/** 발신자부서코드 */
private String snd_emp_dprm_cd;
/** 업무구분코드 */
private String bzwk_cd;
/** 업무세부코드 */
private String sub_bzwk_cd;
/** 시스템코드 */
private String sys_dvcd;
/** 거래일자 */
private String tx_dt;
/** 거래시간 */
private String tx_tktm;
}
@@ -0,0 +1,67 @@
package com.eactive.eai.rms.ext.djb.ums.vo;
import lombok.Data;
@Data
public class SmsDataVO {
/** 발송요청일자 */
private String snd_dman_dt;
/** UUID */
private String snd_dman_id;
/** 발송구분 */
private String snd_dvcd;
/** 발송타입 */
private String ltrs_snd_tycd;
/** LMS 제목 */
private String msg_titl;
/** 메세지 */
private String msg_ctnt;
/** 수신자번호 */
private String recvr_no;
/** 발신번호 */
private String sndn_no;
/** 요청자(직원번호) */
private String snd_empno;
/** 요청부서코드 */
private String snd_emp_dprm_cd;
/** 알림톡 메시지 종류 */
private String msg_snd_tycd;
/** 플러스친구아이디 */
private String almtk_snd_prfl_key;
/** 템플릿코드 */
private String almtk_tmplt_cd;
/** 오류자문자발송여부 */
private String almtk_err_ltrs_snd_yn;
/** 카카오톡전송방식 */
private String almtk_btn_trnm_tycd;
/** 업무구분 코드 */
private String sms_trnm_bzwk_dvcd;
/** 업무세부코드 */
private String sms_bzwk_dcls_dvcd;
/** 시스템코드 */
private String sms_sys_dvcd;
/** 거래일자 */
private String tx_dt;
/** 거래시간 */
private String tx_tktm;
}
@@ -0,0 +1,61 @@
package com.eactive.eai.rms.ext.djb.ums.vo;
import lombok.Data;
@Data
public class StdHeadVO {
private String nxgn_stnd_idfr;
private String guid;
private String guid_prgs_no;
private String stnd_mesg_ver;
private String ortr_guid;
private String sect_ecrpt_yn;
private String frst_trnm_ipad;
private String frst_trnm_ipv4_addr;
private String frst_trnm_mac;
private String frst_mesg_dman_dt;
private String frst_mesg_dman_time;
private String frst_trnm_sys_dvcd;
private String trnm_sys_dvcd;
private String dman_rspn_dvcd;
private String sys_env_dvcd;
private String tx_tycd;
private String synz_dvcd;
private String tx_id;
private String osdch_dvcd;
private String chnl_tycd;
private String if_id;
private String hmab_dvcd;
private String tx_brcd;
private String tlrno;
private String insl_brcd;
private String blng_brcd;
private String mgmt_brcd;
}
@@ -0,0 +1,19 @@
package com.eactive.eai.rms.ext.djb.ums.vo;
import lombok.Data;
@Data
public class SwingCommonVO {
/** 클라이업트 D */
private String clientld;
/** 클라이언트 시크릿 */
private String clientSecret;
/** 회사코드 */
private String companyCode;
/** 요청고유키 */
private String requestUniqueKey;
}
@@ -0,0 +1,21 @@
package com.eactive.eai.rms.ext.djb.ums.vo;
import java.util.List;
import lombok.Data;
@Data
public class SwingDataVO {
/** 알림코드 */
private String notiCode;
/** 알림제목 */
private String notiTitle;
/** 알림내용 */
private String notiContent;
/** 수신자정보 */
private List<SwingReceiverDataVO> receiverInfo;
}
@@ -0,0 +1,22 @@
package com.eactive.eai.rms.ext.djb.ums.vo;
import lombok.Data;
@Data
public class SwingReceiverDataVO {
/** 알림코드 */
private String name;
/** 알림제목 */
private String type;
/** 알림내용 */
private String companyCode;
/** 수신자정보 */
private String code;
/** 상품명 */
private String prdNm;
}
@@ -20,13 +20,15 @@ import javax.servlet.http.HttpSession;
public class SmsAuthController implements InterceptorSkipController { public class SmsAuthController implements InterceptorSkipController {
private final MainController mainController; private final MainController mainController;
private final SmsAuthService smsAuthService;
public SmsAuthController(MainController mainController) { public SmsAuthController(MainController mainController, SmsAuthService smsAuthService) {
this.mainController = mainController; this.mainController = mainController;
this.smsAuthService = smsAuthService;
} }
private SmsAuthService getSmsAuthService() { private SmsAuthService getSmsAuthService() {
return SmsAuthService.getInstance(); return smsAuthService;
} }
/** /**
@@ -56,7 +58,7 @@ public class SmsAuthController implements InterceptorSkipController {
// 인증번호 생성 발송 // 인증번호 생성 발송
String authCode = getSmsAuthService().generateAuthCode(); String authCode = getSmsAuthService().generateAuthCode();
boolean sent = getSmsAuthService().sendAuthCode(userInfo.getCphnno(), authCode); boolean sent = getSmsAuthService().sendAuthCode(userInfo, authCode);
if (sent) { if (sent) {
// 세션에 인증번호 저장 (기존 UserInfo, LoginVo 유지) // 세션에 인증번호 저장 (기존 UserInfo, LoginVo 유지)
@@ -106,7 +108,7 @@ public class SmsAuthController implements InterceptorSkipController {
// 인증번호 생성 발송 // 인증번호 생성 발송
String authCode = getSmsAuthService().generateAuthCode(); String authCode = getSmsAuthService().generateAuthCode();
boolean sent = getSmsAuthService().sendAuthCode(userInfo.getCphnno(), authCode); boolean sent = getSmsAuthService().sendAuthCode(userInfo, authCode);
if (sent) { if (sent) {
LoginVo loginVo = getSmsAuthService().getLoginVoFromSession(session); LoginVo loginVo = getSmsAuthService().getLoginVoFromSession(session);
@@ -1,26 +1,31 @@
package com.eactive.eai.rms.ext.kjb.smsauth; package com.eactive.eai.rms.ext.kjb.smsauth;
import java.security.SecureRandom;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import javax.servlet.http.HttpSession;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.apim.portal.user.entity.UserInfo; import com.eactive.apim.portal.user.entity.UserInfo;
import com.eactive.eai.rms.common.login.LoginVo; import com.eactive.eai.rms.common.login.LoginVo;
import com.eactive.eai.rms.ext.djb.ums.UmsManager;
import com.eactive.ext.kjb.common.KjbProperty; import com.eactive.ext.kjb.common.KjbProperty;
import com.eactive.ext.kjb.common.KjbPropertyHolder; import com.eactive.ext.kjb.common.KjbPropertyHolder;
import com.eactive.ext.kjb.common.KjbUmsException; import com.eactive.ext.kjb.common.KjbUmsException;
import com.eactive.ext.kjb.ums.KjbUmsService; import com.eactive.ext.kjb.ums.KjbUmsService;
import com.eactive.ext.kjb.ums.UmsBizWorkCode;
import com.eactive.ext.kjb.ums.gson.GsonUtil;
import com.eactive.ext.kjb.ums.gson.VerifyPhoneUmsTemplate;
import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpSession; import lombok.RequiredArgsConstructor;
import java.security.SecureRandom; import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@Slf4j @Slf4j
@Service
@RequiredArgsConstructor
public class SmsAuthService { public class SmsAuthService {
private static volatile SmsAuthService instance;
// 세션 // 세션
public static final String SESSION_KEY_AUTH_CODE = "SMS_AUTH_CODE"; public static final String SESSION_KEY_AUTH_CODE = "SMS_AUTH_CODE";
@@ -39,20 +44,7 @@ public class SmsAuthService {
private final SecureRandom random = new SecureRandom(); private final SecureRandom random = new SecureRandom();
private SmsAuthService() { private final UmsManager ums;
// 싱글톤
}
public static SmsAuthService getInstance() {
if (instance == null) {
synchronized (SmsAuthService.class) {
if (instance == null) {
instance = new SmsAuthService();
}
}
}
return instance;
}
private static KjbProperty getProperty() { private static KjbProperty getProperty() {
return KjbPropertyHolder.get(); return KjbPropertyHolder.get();
@@ -116,20 +108,15 @@ public class SmsAuthService {
/** /**
* SMS 인증번호 발송 * SMS 인증번호 발송
*/ */
public boolean sendAuthCode(String phone, String authCode) { public boolean sendAuthCode(UserInfo userInfo, String authCode) {
try { try {
String cleanedPhone = phone.replaceAll("[^0-9]", "").trim(); HashMap<String,Object> params = new HashMap<String, Object>();
String guid = String.format("EAPIM_EMS-%s", params.put("authNumber", authCode);
DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS").format(LocalDateTime.now())); params.put("userName", userInfo.getUsername());
log.debug("\n\n\nDDDDDDDDD" + userInfo.toString());
JsonObject content = GsonUtil.toJsonObject(VerifyPhoneUmsTemplate.builder().authNumber(authCode).build()); ums.send(userInfo, MessageCode.ADMIN_VERIFICATION_MOBILEPHONE, params);
getUmsService().sendKakaoAlimTalk(guid, UmsBizWorkCode.VERIFY_PHONE, cleanedPhone, content);
log.info("SMS 인증번호 발송 완료 - guid: {}, phone: {}****{}",
guid, cleanedPhone.substring(0, 3), cleanedPhone.substring(cleanedPhone.length() - 4));
log.debug("SMS 인증번호 발송 - authCode: {}", authCode);
return true; return true;
} catch (KjbUmsException e) { } catch (Exception e) {
log.error("SMS 인증번호 발송 실패", e); log.error("SMS 인증번호 발송 실패", e);
return false; return false;
} }
@@ -267,17 +254,14 @@ public class SmsAuthService {
} }
/** /**
* 전화번호 마스킹 * 전화번호 마스킹 (표준 규칙: 2·3번째 세그먼트 각각 2자리)
* : 010-1234-5678 010-12**-56**
*/ */
public String maskPhoneNumber(String phone) { public String maskPhoneNumber(String phone) {
if (StringUtils.isEmpty(phone)) { if (StringUtils.isEmpty(phone)) {
return "****"; return "****";
} }
String cleaned = phone.replaceAll("[^0-9]", ""); return com.eactive.eai.common.util.MaskingUtils.maskPhoneNumber(phone);
if (cleaned.length() < 7) {
return "****";
}
return cleaned.substring(0, 3) + "****" + cleaned.substring(cleaned.length() - 4);
} }
/** /**
@@ -286,11 +270,4 @@ public class SmsAuthService {
public boolean isEnabled() { public boolean isEnabled() {
return getProperty().isSmsAuthEnabled(); return getProperty().isSmsAuthEnabled();
} }
/**
* 테스트용 인스턴스 리셋
*/
public static void resetForTest() {
instance = null;
}
} }
@@ -134,8 +134,8 @@ public class SsoController implements InterceptorSkipController {
log.debug("SSO 사용자 정보 - userId: {}, name: {}, phone: {}, email: {}", log.debug("SSO 사용자 정보 - userId: {}, name: {}, phone: {}, email: {}",
userId, userId,
MaskingUtils.maskName(name), MaskingUtils.maskName(name),
maskPhoneNumber(cellPhoneNo), MaskingUtils.maskPhoneNumber(cellPhoneNo),
maskEmail(email)); MaskingUtils.maskEmailId(email));
// 사용자 생성 또는 업데이트 // 사용자 생성 또는 업데이트
UserInfo userInfo = findOrCreateUser(info, extendedInfo); UserInfo userInfo = findOrCreateUser(info, extendedInfo);
@@ -341,33 +341,4 @@ public class SsoController implements InterceptorSkipController {
} }
return phone.replaceAll("[^0-9]", ""); return phone.replaceAll("[^0-9]", "");
} }
/**
* 휴대폰번호 마스킹 (로그용)
*/
private String maskPhoneNumber(String phone) {
if (StringUtils.isEmpty(phone) || phone.length() < 4) {
return "****";
}
// 010-1234-5678 010-****-5678
String cleaned = phone.replaceAll("[^0-9]", "");
if (cleaned.length() < 7) {
return "****";
}
return cleaned.substring(0, 3) + "****" + cleaned.substring(cleaned.length() - 4);
}
/**
* 이메일 마스킹 (로그용)
*/
private String maskEmail(String email) {
if (StringUtils.isEmpty(email) || !email.contains("@")) {
return "****";
}
int atIndex = email.indexOf("@");
if (atIndex <= 2) {
return "**" + email.substring(atIndex);
}
return email.substring(0, 2) + "**" + email.substring(atIndex);
}
} }
@@ -110,11 +110,13 @@ public class PortalAppApprovalListener implements ApprovalListener {
return; return;
} }
MessageRecipient recipient = new MessageRecipient(); MessageRecipient recipient = new MessageRecipient();
recipient.setUsername(requester.getUserName());
recipient.setPhone(requester.getMobileNumber()); recipient.setPhone(requester.getMobileNumber());
recipient.setUserId(requester.getEmailAddr()); recipient.setUserId(requester.getEmailAddr());
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.put("apiKey", appRequest.getClientName()); // DB 템플릿 APP_APPROVE SMS 변수(%APP_NAME%) 매핑
messageSendService.sendMessage(MessageCode.APP_REGISTER_APPROVED, recipient, params); params.put("APP_NAME", appRequest.getClientName());
messageSendService.sendMessage(MessageCode.APP_APPROVE, recipient, params);
} }
private void syncTargetServer(AppRequestType action, CredentialUI credentialUI) throws ApprovalDeployException { private void syncTargetServer(AppRequestType action, CredentialUI credentialUI) throws ApprovalDeployException {
@@ -225,5 +227,36 @@ public class PortalAppApprovalListener implements ApprovalListener {
@Transactional @Transactional
public void rollback(Approval approval) { public void rollback(Approval approval) {
logger.info("Approval {} rollback", approval.getId()); logger.info("Approval {} rollback", approval.getId());
// 사용 거절 통지
Optional<AppRequest> optRequest = appRequestRepository.findAppRequestByApproval(approval);
if (!optRequest.isPresent()) {
return;
}
AppRequest appRequest = optRequest.get();
com.eactive.apim.portal.portaluser.entity.PortalUser requester = approval.getRequester();
if (requester == null) {
logger.warn("앱 거절 통지 생략 - 요청자 정보 없음. appRequestId: {}", appRequest.getId());
return;
}
MessageRecipient recipient = new MessageRecipient();
recipient.setUsername(requester.getUserName());
recipient.setPhone(requester.getMobileNumber());
recipient.setUserId(requester.getEmailAddr());
Map<String, String> params = new HashMap<>();
// DB 템플릿 APP_REJECTED SMS 변수(%APP_NAME%, %REASON%) 매핑
params.put("APP_NAME", appRequest.getClientName());
params.put("REASON", extractRejectReason(approval));
messageSendService.sendMessage(MessageCode.APP_REJECTED, recipient, params);
}
private String extractRejectReason(Approval approval) {
if (approval.getApprovers() == null) {
return "";
}
return approval.getApprovers().stream()
.map(com.eactive.apim.portal.approval.entity.Approver::getApprovalMessage)
.filter(m -> m != null && !m.isEmpty())
.findFirst().orElse("");
} }
} }
@@ -94,10 +94,15 @@ public class PortalUserApprovalListener implements ApprovalListener {
private void sendApprovalResult(PortalUser portalUser) { private void sendApprovalResult(PortalUser portalUser) {
MessageRecipient recipient = new MessageRecipient(); MessageRecipient recipient = new MessageRecipient();
recipient.setUsername(portalUser.getUserName());
recipient.setPhone(portalUser.getMobileNumber()); recipient.setPhone(portalUser.getMobileNumber());
recipient.setUserId(portalUser.getEmailAddr()); recipient.setUserId(portalUser.getEmailAddr());
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
// messageSendService.sendMessage(MessageCode.USER_REGISTRATION_APPROVED, recipient, params); // DB 템플릿 MANAGER_WITH_ORG_REGISTER_APPROVED SMS 변수(%ORG_NAME%) 매핑
PortalOrg org = portalUser.getPortalOrg();
if (org != null) {
params.put("ORG_NAME", org.getOrgName());
}
messageSendService.sendMessage(MessageCode.MANAGER_WITH_ORG_REGISTER_APPROVED, recipient, params); messageSendService.sendMessage(MessageCode.MANAGER_WITH_ORG_REGISTER_APPROVED, recipient, params);
} }
@@ -155,6 +160,13 @@ public class PortalUserApprovalListener implements ApprovalListener {
PortalUser portalUser = portalUserService.findByUserId(userId); PortalUser portalUser = portalUserService.findByUserId(userId);
PortalOrg portalOrg = portalUser.getPortalOrg(); PortalOrg portalOrg = portalUser.getPortalOrg();
// 거절 통지에 필요한 정보를 반려 처리(정보 마스킹) 이전에 캡처
String noticeName = portalUser.getUserName();
String noticePhone = portalUser.getMobileNumber();
String noticeEmail = portalUser.getEmailAddr();
String noticeOrgName = portalOrg != null ? portalOrg.getOrgName() : null;
String rejectReason = extractRejectReason(approval);
// 개인법인 전환 요청 반려: approvalStatus가 PENDING이면 전환 신청이었으므로 개인 사용자로 복원 // 개인법인 전환 요청 반려: approvalStatus가 PENDING이면 전환 신청이었으므로 개인 사용자로 복원
if (PortalUserEnums.ApprovalStatus.PENDING.equals(portalUser.getApprovalStatus())) { if (PortalUserEnums.ApprovalStatus.PENDING.equals(portalUser.getApprovalStatus())) {
logger.info("Approval {} is a personal-to-corporate conversion rejection. Reverting user {} to personal user.", approval.getId(), userId); logger.info("Approval {} is a personal-to-corporate conversion rejection. Reverting user {} to personal user.", approval.getId(), userId);
@@ -185,19 +197,32 @@ public class PortalUserApprovalListener implements ApprovalListener {
portalOrg.setOrgName("삭제된법인"); portalOrg.setOrgName("삭제된법인");
portalOrg.setApprovalStatus(ApprovalStatus.REJECTED); portalOrg.setApprovalStatus(ApprovalStatus.REJECTED);
portalOrg.setOrgStatus(OrgStatus.REMOVED); portalOrg.setOrgStatus(OrgStatus.REMOVED);
portalOrg.setOrgCode(null); portalOrg.clearSensitiveDataOnRemoval();
portalOrg.setCompRegFile(null);
portalOrg.setCorpRegNo(null);
portalOrg.setCompRegNo(null);
portalOrg.setCeoName(null);
portalOrg.setOrgAddr(null);
portalOrg.setOrgPhoneNumber(null);
portalOrg.setScPhoneNumber(null);
portalOrg.setOrgSectors(null);
portalOrg.setOrgIndustryType(null);
portalOrg.setServiceName(null);
portalOrgService.save(portalOrg); portalOrgService.save(portalOrg);
} }
// 법인관리자/법인 등록 거절 통지 (정보 마스킹 이전 캡처값 사용)
MessageRecipient recipient = new MessageRecipient();
recipient.setUsername(noticeName);
recipient.setPhone(noticePhone);
recipient.setUserId(noticeEmail);
Map<String, String> params = new HashMap<>();
// DB 템플릿 MANAGER_WITH_ORG_REGISTER_REJECTED SMS 변수(%ORG_NAME%, %REASON%) 매핑
if (noticeOrgName != null) {
params.put("ORG_NAME", noticeOrgName);
}
params.put("REASON", rejectReason);
messageSendService.sendMessage(MessageCode.MANAGER_WITH_ORG_REGISTER_REJECTED, recipient, params);
}
private String extractRejectReason(Approval approval) {
if (approval.getApprovers() == null) {
return "";
}
return approval.getApprovers().stream()
.map(com.eactive.apim.portal.approval.entity.Approver::getApprovalMessage)
.filter(m -> m != null && !m.isEmpty())
.findFirst().orElse("");
} }
} }
@@ -1,83 +1,52 @@
package com.eactive.eai.rms.onl.apim.masking; package com.eactive.eai.rms.onl.apim.masking;
import com.eactive.eai.rms.common.util.StringUtils; /**
* 개인정보 마스킹 유틸리티 (eapim-admin)
import java.util.Arrays; *
import java.util.List; * <p>실제 마스킹 규칙은 보안아키텍처 표준 구현인
import java.util.stream.Collectors; * {@link com.eactive.eai.common.util.MaskingUtils}(elink-online-core) 위임한다.
* 기존 호출부 호환을 위해 메서드명/시그니처는 그대로 유지한다.</p>
*
* <pre>
* 이메일 eact***@gmail.com () **ct1**@gmail.com (앞2·뒤2, 4자 이하 전체)
* 이름 홍길* () * (2자 뒤1, 3자 가운데 전체)
* 전화 010-****-5678 () 010-12**-56** (세그먼트별 2자리)
* IPv4 192.168.***.1 (3번째 옥텟) / IPv6 마지막 그룹, 콤마 다중 IP 지원
* </pre>
*/
public class MaskingUtils { public class MaskingUtils {
private MaskingUtils() {}
/** /**
* 이메일 주소의 ID 부분을 마스킹 처리 * 이메일 주소의 ID 부분을 마스킹 처리
* : eactive@gmail.com => eact***@gmail.com * : aajjbacc@gmail.com => **jjba**@gmail.com
*/ */
public static String maskEmailId(String email) { public static String maskEmailId(String email) {
if (email == null || email.isEmpty() || !email.contains("@")) { return com.eactive.eai.common.util.MaskingUtils.maskEmail(email);
return email;
}
String[] parts = email.split("@");
String id = parts[0];
String domain = parts[1];
if (id.length() <= 3) {
return "***" + "@" + domain;
}
String maskedId = id.substring(0, id.length() - 3) + "***";
return maskedId + "@" + domain;
} }
/** /**
* 이름 지막 글자를 마스킹 처리 * 이름 스킹 처리 (2자: 1자리, 3자 이상: 앞뒤 제외 가운데 전체)
* : 홍길동 => *
*/ */
public static String maskName(String name) { public static String maskName(String name) {
if (name == null || name.isEmpty() || name.length() < 2) { return com.eactive.eai.common.util.MaskingUtils.maskKoreanName(name);
return name;
}
return name.substring(0, name.length() - 1) + "*";
} }
/** /**
* 전화번호 마스킹 처리 * 전화번호/휴대폰/FAX 마스킹 처리 (2·3번째 세그먼트 각각 2자리)
* : 010-1234-5678 => 010-****-5678 * : 010-1234-5678 => 010-12**-56**
*/ */
public static String maskPhoneNumber(String phoneNumber) { public static String maskPhoneNumber(String phoneNumber) {
if (phoneNumber == null || phoneNumber.isEmpty()) { return com.eactive.eai.common.util.MaskingUtils.maskPhoneNumber(phoneNumber);
return phoneNumber;
}
String[] parts = phoneNumber.split("-");
if (parts.length != 3) {
return phoneNumber;
}
return parts[0] + "-****-" + parts[2];
} }
/** /**
* IP 주소 마스킹 처리 * IP 주소 마스킹 처리 (IPv4 3번째 옥텟 / IPv6 마지막 그룹, 콤마 다중 IP 지원)
* : 192.168.1.1 => 192.168.*.* * : 192.168.1.1 => 192.168.***.1
*/ */
public static String maskIpAddress(String ipAddresses) { public static String maskIpAddress(String ipAddresses) {
if (StringUtils.isBlank(ipAddresses)) { return com.eactive.eai.common.util.MaskingUtils.maskIpAddress(ipAddresses);
return ipAddresses;
}
String[] ips = ipAddresses.split(",");
List<String> maskedIps = Arrays.stream(ips)
.map(ip -> {
String[] parts = ip.trim().split("\\.");
if (parts.length == 4) {
// 번째 octet을 *** 마스킹
parts[2] = "***";
return String.join(".", parts);
}
return ip; // 유효하지 않은 IP 형식은 그대로 반환
})
.collect(Collectors.toList());
return String.join(",", maskedIps);
} }
} }
@@ -0,0 +1,117 @@
package com.eactive.eai.rms.onl.apim.masking;
import java.util.Arrays;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 메세지 본문/메신저ID 패턴 기반 마스킹 유틸 (발송 내역 화면 전용).
*
* <p>본문(message) 안에 섞여 있는 개인정보/인증정보를 패턴으로 찾아 마스킹하고,
* 패턴 종류별로 색상 강조 {@code <span>} 으로 감싼 <b>안전한 HTML</b> 만든다.
* 매칭되지 않은 영역과 마스킹 결과 모두 HTML escape 하므로 본문에 스크립트가 있어도 무력화된다.</p>
*
* <pre>
* 이메일 test@gmail.com &lt;span class="mask-email"&gt;**st@gmail.com&lt;/span&gt;
* 휴대폰(하이픈) 010-1234-5678 &lt;span class="mask-phone"&gt;010-12**-56**&lt;/span&gt;
* 6자리+ 숫자 123456 &lt;span class="mask-digits"&gt;123***&lt;/span&gt; (앞 3자리 제외)
* 메신저ID kakao_abcd kakao_ab** ( 2자리)
* </pre>
*
* <p>실제 이메일/휴대폰 마스킹 규칙은 표준 구현
* {@link com.eactive.eai.common.util.MaskingUtils}(elink-online-core) 위임한다.</p>
*/
public final class MessagePatternMaskingUtils {
private MessagePatternMaskingUtils() {}
private static final int DIGITS_KEEP_HEAD = 3;
/**
* 매칭 우선순위(이메일 &gt; 하이픈 휴대폰 &gt; 6자리+ 숫자) 단일 패스로 보장하는 결합 정규식.
* 휴대폰 하이픈 형식이 "6자리 이상 숫자" 규칙에 이중 적용되지 않도록 Matcher 순회한다.
*/
private static final Pattern COMBINED = Pattern.compile(
"(?<email>[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,})"
+ "|(?<phone>01[016789]-\\d{3,4}-\\d{4})"
+ "|(?<digits>\\d{6,})");
/** 본문 → escape + 패턴별 마스킹/색상강조 span 이 적용된 안전 HTML 반환. */
public static String maskAndHighlight(String raw) {
if (raw == null || raw.isEmpty()) {
return "";
}
Matcher m = COMBINED.matcher(raw);
StringBuilder sb = new StringBuilder();
int last = 0;
while (m.find()) {
sb.append(escapeHtml(raw.substring(last, m.start())));
String token = m.group();
if (m.group("email") != null) {
sb.append(span("mask-email", com.eactive.eai.common.util.MaskingUtils.maskEmail(token)));
} else if (m.group("phone") != null) {
sb.append(span("mask-phone", com.eactive.eai.common.util.MaskingUtils.maskPhoneNumber(token)));
} else {
sb.append(span("mask-digits", maskKeepHead(token, DIGITS_KEEP_HEAD)));
}
last = m.end();
}
sb.append(escapeHtml(raw.substring(last)));
return sb.toString();
}
/** 메신저 ID 마스킹: 뒤 2자리(2자 이하는 전체) 마스킹. */
public static String maskMessengerId(String id) {
if (id == null || id.isEmpty()) {
return id;
}
if (id.length() <= 2) {
return repeat('*', id.length());
}
return id.substring(0, id.length() - 2) + "**";
}
/** 앞 head 자리만 남기고 나머지를 '*' 로 마스킹. */
private static String maskKeepHead(String digits, int head) {
if (digits.length() <= head) {
return digits;
}
return digits.substring(0, head) + repeat('*', digits.length() - head);
}
private static String span(String cls, String inner) {
return "<span class=\"" + cls + "\">" + escapeHtml(inner) + "</span>";
}
/**
* 최소 HTML escape. {@code < > & " '} 만 변환하고 한글 등 비-ASCII 문자는 보존한다.
* (commons-lang {@code escapeHtml} 0x7F 초과 문자를 {@code &#NNN;} 변환해 한글이 깨지므로 직접 구현)
*/
private static String escapeHtml(String s) {
if (s == null || s.isEmpty()) {
return "";
}
StringBuilder sb = new StringBuilder(s.length());
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
switch (c) {
case '&': sb.append("&amp;"); break;
case '<': sb.append("&lt;"); break;
case '>': sb.append("&gt;"); break;
case '"': sb.append("&quot;"); break;
case '\'': sb.append("&#39;"); break;
default: sb.append(c);
}
}
return sb.toString();
}
private static String repeat(char c, int n) {
if (n <= 0) {
return "";
}
char[] a = new char[n];
Arrays.fill(a, c);
return new String(a);
}
}
@@ -0,0 +1,67 @@
package com.eactive.eai.rms.onl.apim.messagerequest;
import com.eactive.eai.rms.common.base.BaseAnnotationController;
import com.eactive.eai.rms.common.vo.GridResponse;
import com.eactive.eai.rms.data.entity.onl.apim.messagerequest.MessageRequestUISearch;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.SortDefault;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.HashMap;
import java.util.Map;
/**
* 발송 내역(PTL_MESSAGE_REQUEST) 조회 화면 컨트롤러.
*
* <p>조회 전용 + PENDINGFAILED 상태 전환만 제공한다. (등록/수정/삭제 없음)</p>
*/
@Controller
@RequiredArgsConstructor
public class MessageRequestManController extends BaseAnnotationController {
private final MessageRequestManService messageRequestManService;
@GetMapping(value = "/onl/apim/messagerequest/messageRequestMan.view")
public void view() {
// 목록 view
}
@GetMapping(value = "/onl/apim/messagerequest/messageRequestMan.view", params = "cmd=DETAIL")
public String detailView() {
return "/onl/apim/messagerequest/messageRequestManDetail";
}
@PostMapping(value = "/onl/apim/messagerequest/messageRequestMan.json", params = "cmd=LIST")
public ResponseEntity<GridResponse<MessageRequestUI>> selectList(
@SortDefault(sort = "requestDate", direction = Sort.Direction.DESC) Pageable pageable,
MessageRequestUISearch search) {
Page<MessageRequestUI> page = messageRequestManService.selectList(pageable, search);
return ResponseEntity.ok(new GridResponse<>(page));
}
@PostMapping(value = "/onl/apim/messagerequest/messageRequestMan.json", params = "cmd=LIST_INIT_COMBO")
public ResponseEntity<Map<String, Object>> initCombo() {
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("statusList", messageRequestManService.statusCombo());
resultMap.put("messageCodeList", messageRequestManService.messageCodeCombo());
return ResponseEntity.ok(resultMap);
}
@PostMapping(value = "/onl/apim/messagerequest/messageRequestMan.json", params = "cmd=DETAIL")
public ResponseEntity<MessageRequestUI> selectDetail(String id) {
return ResponseEntity.ok(messageRequestManService.selectDetail(id));
}
/** PENDING 건을 FAILED 로 전환 (감사 포인트: UPDATE_STATUS). */
@PostMapping(value = "/onl/apim/messagerequest/messageRequestMan.json", params = "cmd=UPDATE_STATUS")
public ResponseEntity<Void> updateStatus(String id) {
messageRequestManService.updateStatusToFailed(id);
return ResponseEntity.ok().build();
}
}
@@ -0,0 +1,106 @@
package com.eactive.eai.rms.onl.apim.messagerequest;
import com.eactive.apim.portal.template.entity.MessageCode;
import com.eactive.apim.portal.template.entity.MessageRequest;
import com.eactive.eai.rms.common.base.BaseService;
import com.eactive.eai.rms.common.combo.ComboVo;
import com.eactive.eai.rms.data.entity.onl.apim.messagerequest.MessageRequestUISearch;
import com.eactive.eai.rms.onl.apim.masking.MaskingUtils;
import com.eactive.eai.rms.onl.apim.masking.MessagePatternMaskingUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
@Service
@Transactional(transactionManager = "transactionManagerForEMS")
public class MessageRequestManService extends BaseService {
// KST 한글 요일 포맷 (표시용 / 툴팁용)
private static final DateTimeFormatter FMT_SHORT = DateTimeFormatter.ofPattern("MM-dd(E) HH:mm", Locale.KOREA);
private static final DateTimeFormatter FMT_FULL = DateTimeFormatter.ofPattern("yyyy-MM-dd (EEE) HH:mm:ss", Locale.KOREA);
private final com.eactive.eai.rms.data.entity.onl.apim.messagerequest.MessageRequestService messageRequestService;
@Autowired
public MessageRequestManService(com.eactive.eai.rms.data.entity.onl.apim.messagerequest.MessageRequestService messageRequestService) {
this.messageRequestService = messageRequestService;
}
public Page<MessageRequestUI> selectList(Pageable pageable, MessageRequestUISearch search) {
return messageRequestService.findAll(pageable, search).map(this::convertToUI);
}
public MessageRequestUI selectDetail(String id) {
return convertToUI(messageRequestService.getById(id));
}
/** PENDING → FAILED 전환. */
public void updateStatusToFailed(String id) {
messageRequestService.updateStatusToFailedIfPending(id);
}
/** 엔티티 → 마스킹/포맷 적용된 UI 변환 (목록·상세 공통). */
private MessageRequestUI convertToUI(MessageRequest e) {
MessageRequestUI ui = new MessageRequestUI();
ui.setId(e.getId());
ui.setMessageCode(e.getMessageCode() != null ? e.getMessageCode().name() : null);
ui.setMessageCodeName(e.getMessageCode() != null ? e.getMessageCode().getDescription() : null);
ui.setSubject(e.getSubject());
ui.setMessageType(e.getMessageType());
// 본문: 패턴 마스킹 + 색상강조 안전 HTML
ui.setMessageHtml(MessagePatternMaskingUtils.maskAndHighlight(e.getMessage()));
// 수신자 마스킹 (email/phone @Convert 이미 복호화된 평문)
ui.setUsername(MaskingUtils.maskName(e.getUsername()));
ui.setEmail(MaskingUtils.maskEmailId(e.getEmail()));
ui.setPhone(MaskingUtils.maskPhoneNumber(e.getPhone()));
ui.setMessengerId(MessagePatternMaskingUtils.maskMessengerId(e.getMessengerId()));
ui.setUmsUid(e.getUmsUid());
ui.setRequestStatus(e.getRequestStatus());
ui.setEaiInterfaceId(e.getEaiInterfaceId());
ui.setServiceId(e.getServiceId());
ui.setRequestDateShort(fmt(e.getRequestDate(), FMT_SHORT));
ui.setRequestDateFull(fmt(e.getRequestDate(), FMT_FULL));
ui.setSentDateShort(fmt(e.getSentDate(), FMT_SHORT));
ui.setSentDateFull(fmt(e.getSentDate(), FMT_FULL));
return ui;
}
private static String fmt(LocalDateTime t, DateTimeFormatter f) {
return t == null ? "" : t.format(f);
}
/** 상태 검색 콤보 (PENDING/SENT/FAILED). */
public List<ComboVo> statusCombo() {
return Arrays.stream(new String[]{"PENDING", "SENT", "FAILED"})
.map(s -> {
ComboVo v = new ComboVo();
v.setCode(s);
v.setCodename(s);
return v;
}).collect(Collectors.toList());
}
/** 메세지 코드 검색 콤보 (enum name → 한글 설명). */
public List<ComboVo> messageCodeCombo() {
return Arrays.stream(MessageCode.values())
.map(c -> {
ComboVo v = new ComboVo();
v.setCode(c.name());
v.setCodename(c.getDescription());
return v;
}).collect(Collectors.toList());
}
}
@@ -0,0 +1,42 @@
package com.eactive.eai.rms.onl.apim.messagerequest;
import lombok.Data;
/**
* 발송 내역(PTL_MESSAGE_REQUEST) 화면 응답 DTO.
*
* <p>개인정보는 모두 마스킹된 값으로 채워지며, 본문(messageHtml) 패턴 마스킹 + 색상강조가 적용된
* 안전한 HTML 이다. 날짜는 표시용(short)/툴팁용(full) 가지 포맷 문자열로 제공한다.</p>
*/
@Data
public class MessageRequestUI {
private String id;
/* 제목/코드 — subject 가 없으면 화면에서 messageCode 로 대체 표기 */
private String messageCode; // MessageCode enum name (제목 마우스오버/대체용)
private String messageCodeName; // MessageCode.getDescription() 한글명
private String subject;
private String messageType; // EMAIL/SMS
/* 본문 — 패턴 마스킹 + span 색상강조된 안전 HTML */
private String messageHtml;
/* 수신자 (마스킹) */
private String username;
private String email;
private String phone;
private String messengerId;
/* 발송 메타 */
private String umsUid;
private String requestStatus; // PENDING/SENT/FAILED
private String eaiInterfaceId;
private String serviceId;
/* 요청/발송 시간 — 표시용(short) / 툴팁용(full) */
private String requestDateShort; // MM-dd(E) HH:mm
private String requestDateFull; // yyyy-MM-dd (EEE) HH:mm:ss
private String sentDateShort;
private String sentDateFull;
}
@@ -80,4 +80,10 @@ public class PortalNoticeManController extends BaseAnnotationController {
return ResponseEntity.ok().build(); return ResponseEntity.ok().build();
} }
@PostMapping(value = "/onl/apim/portalnotice/portalNoticeMan.json", params = "cmd=DELETE_BULK")
public ResponseEntity<String> deleteBulk(String ids) {
portalNoticeManService.deleteBulk(ids);
return ResponseEntity.ok().build();
}
} }
@@ -33,6 +33,7 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -282,4 +283,20 @@ public class PortalNoticeManService extends BaseService {
portalNoticeService.deleteById(id); portalNoticeService.deleteById(id);
} }
public void deleteBulk(String ids) {
if (StringUtils.isBlank(ids)) {
return;
}
List<String> idList = Arrays.asList(ids.split(","));
// 첨부파일 정리 (단건 삭제와 동일한 처리)
idList.forEach(id -> {
PortalNotice portalNotice = portalNoticeService.getById(id);
Optional.ofNullable(portalNotice.getFileId()).ifPresent(fileService::deleteFile);
});
portalNoticeService.deleteByIds(idList);
}
} }
@@ -64,12 +64,13 @@ public class PortalNoticeUI {
private String summary; private String summary;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") // HTML <input type="datetime-local"> 'T' 구분자 형식 (: 2026-06-16T10:29).
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
private LocalDateTime startedAt; private LocalDateTime startedAt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
private LocalDateTime endAt; private LocalDateTime endAt;
private String state; // INCIDENT 한정 (INVESTIGATING/IDENTIFIED/MONITORING/RESOLVED/CANCELED) private String state; // INCIDENT 한정 (INVESTIGATING/IDENTIFIED/MONITORING/RESOLVED/CANCELED)
@@ -1,55 +0,0 @@
package com.eactive.eai.rms.onl.apim.portalorg;
import com.eactive.ext.kjb.common.KjbObpException;
import com.eactive.ext.kjb.obp.KjbObpModule;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
/**
* OBP 파트너코드 조회 서비스
*/
@Slf4j
@Service
public class ObpPartnerCodeService {
private KjbObpModule getObpModule() {
return KjbObpModule.getInstance();
}
/**
* 사업자등록번호로 OBP 파트너코드 조회
* @param compRegNo 사업자등록번호
* @return 조회 결과 (success, partnerCode 또는 message)
*/
public Map<String, Object> queryPartnerCode(String compRegNo) {
Map<String, Object> result = new HashMap<>();
try {
String partnerCode = getObpModule().queryPartnerCode(compRegNo);
result.put("success", true);
result.put("partnerCode", partnerCode);
log.info("[OBP] 파트너코드 조회 성공 - compRegNo: {}, partnerCode: {}", compRegNo, partnerCode);
} catch (IllegalArgumentException e) {
log.warn("[OBP] 파트너코드 조회 실패 - 잘못된 입력: {}", e.getMessage());
result.put("success", false);
result.put("message", e.getMessage());
} catch (KjbObpException e) {
log.warn("[OBP] 파트너코드 조회 실패 - OBP 오류: {}", e.getMessage());
result.put("success", false);
result.put("message", "OBP 조회 실패: " + e.getMessage());
} catch (Exception e) {
log.error("[OBP] 파트너코드 조회 중 오류 발생", e);
result.put("success", false);
result.put("message", "시스템 오류가 발생했습니다.");
}
return result;
}
}
@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestParam;
@Slf4j @Slf4j
@Controller @Controller
@@ -36,7 +35,6 @@ public class PortalOrgManController extends BaseAnnotationController {
private final PortalOrgManService portalOrgManService; private final PortalOrgManService portalOrgManService;
private final ComboService comboService; private final ComboService comboService;
private final ObpPartnerCodeService obpPartnerCodeService;
@GetMapping(value = "/onl/apim/portalorg/portalOrgMan.view") @GetMapping(value = "/onl/apim/portalorg/portalOrgMan.view")
public void view() { public void view() {
@@ -194,15 +192,4 @@ public class PortalOrgManController extends BaseAnnotationController {
return ResponseEntity.ok(new GridResponse<>(page)); return ResponseEntity.ok(new GridResponse<>(page));
} }
/**
* OBP 파트너코드 조회
* @param compRegNo 사업자등록번호
* @return partnerCode
*/
@PostMapping(value = "/onl/apim/portalorg/portalOrgMan.json", params = "cmd=QUERY_OBP_PARTNER_CODE")
public ResponseEntity<Map<String, Object>> queryObpPartnerCode(@RequestParam("compRegNo") String compRegNo) {
Map<String, Object> result = obpPartnerCodeService.queryPartnerCode(compRegNo);
return ResponseEntity.ok(result);
}
} }
@@ -139,6 +139,7 @@ public class PortalOrgManService extends BaseService {
PortalOrg portalOrg = portalOrgService.getById(id); PortalOrg portalOrg = portalOrgService.getById(id);
portalOrg.setOrgName("삭제된법인"); portalOrg.setOrgName("삭제된법인");
portalOrg.setOrgStatus(OrgStatus.REMOVED); portalOrg.setOrgStatus(OrgStatus.REMOVED);
portalOrg.clearSensitiveDataOnRemoval();
portalOrgService.save(portalOrg); portalOrgService.save(portalOrg);
} }
@@ -70,5 +70,7 @@ public class PortalOrgUI {
private String serviceName; private String serviceName;
private String scPhoneNumber; private String scPhoneNumber;
private String reverseProxyPath;
} }
@@ -55,4 +55,16 @@ public class PortalPartnershipManController extends BaseAnnotationController {
return ResponseEntity.ok(portalPartnershipUI); return ResponseEntity.ok(portalPartnershipUI);
} }
@PostMapping(value = "/onl/apim/portalpartnership/portalPartnershipMan.json", params = "cmd=DELETE")
public ResponseEntity<Void> delete(String id) {
portalPartnershipManService.delete(id);
return ResponseEntity.ok().build();
}
@PostMapping(value = "/onl/apim/portalpartnership/portalPartnershipMan.json", params = "cmd=DELETE_BULK")
public ResponseEntity<Void> deleteBulk(String ids) {
portalPartnershipManService.deleteBulk(ids);
return ResponseEntity.ok().build();
}
} }
@@ -15,6 +15,10 @@ import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
@Service @Service
@Transactional(transactionManager = "transactionManagerForEMS") @Transactional(transactionManager = "transactionManagerForEMS")
public class PortalPartnershipManService extends BaseService { public class PortalPartnershipManService extends BaseService {
@@ -51,18 +55,48 @@ public class PortalPartnershipManService extends BaseService {
return convertToUIWithMaskOption(partnershipApplication, false); return convertToUIWithMaskOption(partnershipApplication, false);
} }
public void delete(String id) {
PartnershipApplication partnership = partnershipService.getById(id);
Optional.ofNullable(partnership.getFileId())
.filter(StringUtils::isNotBlank)
.ifPresent(fileService::deleteFile);
partnershipService.deleteById(id);
}
public void deleteBulk(String ids) {
if (StringUtils.isBlank(ids)) {
return;
}
List<String> idList = Arrays.asList(ids.split(","));
// 첨부파일 정리 (단건 삭제와 동일한 처리)
idList.forEach(id -> {
PartnershipApplication partnership = partnershipService.getById(id);
Optional.ofNullable(partnership.getFileId())
.filter(StringUtils::isNotBlank)
.ifPresent(fileService::deleteFile);
});
partnershipService.deleteByIds(idList);
}
private PortalPartnershipUI convertToUIWithMaskOption(PartnershipApplication partnership, boolean isMasked) { private PortalPartnershipUI convertToUIWithMaskOption(PartnershipApplication partnership, boolean isMasked) {
PortalPartnershipUI partnershipUI = portalPartnershipUIMapper.toVo(partnership); PortalPartnershipUI partnershipUI = portalPartnershipUIMapper.toVo(partnership);
PortalUser user = findUser(partnership.getCreatedBy()); PortalUser user = findUser(partnership.getCreatedBy());
// 작성자(createdBy) 해당하는 포털 사용자가 없을 있음(탈퇴/삭제, 시스템 작성 )
String userName = user != null ? user.getUserName() : null;
String loginId = user != null ? user.getLoginId() : null;
if (isMasked) { if (isMasked) {
// 마스킹 처리 // 마스킹 처리
partnershipUI.setCreatedByName(MaskingUtils.maskName(user.getUserName())); partnershipUI.setCreatedByName(MaskingUtils.maskName(userName));
partnershipUI.setCreatedById(MaskingUtils.maskEmailId(user.getLoginId())); partnershipUI.setCreatedById(MaskingUtils.maskEmailId(loginId));
} else { } else {
// 마스킹 해제 상태 // 마스킹 해제 상태
partnershipUI.setCreatedByName(user.getUserName()); partnershipUI.setCreatedByName(userName);
partnershipUI.setCreatedById(user.getLoginId()); partnershipUI.setCreatedById(loginId);
} }
// 첨부파일 처리 // 첨부파일 처리
@@ -14,6 +14,7 @@ public interface PortalPropertyMapper extends GenericMapper<PropertyUI, PortalPr
@Mapping(source = "prptyGroupName", target = "id.propertyGroupName") @Mapping(source = "prptyGroupName", target = "id.propertyGroupName")
@Mapping(source = "prptyName", target = "id.propertyName") @Mapping(source = "prptyName", target = "id.propertyName")
@Mapping(source = "prpty2Val", target = "propertyValue") @Mapping(source = "prpty2Val", target = "propertyValue")
@Mapping(source = "prptyDesc", target = "propertyDesc")
@Override @Override
PortalProperty toEntity(PropertyUI vo); PortalProperty toEntity(PropertyUI vo);
@@ -21,6 +22,7 @@ public interface PortalPropertyMapper extends GenericMapper<PropertyUI, PortalPr
@Mapping(source ="id.propertyGroupName", target = "prptyGroupName") @Mapping(source ="id.propertyGroupName", target = "prptyGroupName")
@Mapping(source ="id.propertyName", target = "prptyName") @Mapping(source ="id.propertyName", target = "prptyName")
@Mapping(source ="propertyValue", target = "prpty2Val") @Mapping(source ="propertyValue", target = "prpty2Val")
@Mapping(source ="propertyDesc", target = "prptyDesc")
@InheritInverseConfiguration @InheritInverseConfiguration
@Override @Override
PropertyUI toVo(PortalProperty entity); PropertyUI toVo(PortalProperty entity);

Some files were not shown because too many files have changed in this diff Show More