diff --git a/mens-admin/src/main/java/kr/xit/core/spring/auth/CustomAuthenticationEntryPoint.java b/mens-admin/src/main/java/kr/xit/core/spring/auth/CustomAuthenticationEntryPoint.java index 47ab375..016b6d6 100644 --- a/mens-admin/src/main/java/kr/xit/core/spring/auth/CustomAuthenticationEntryPoint.java +++ b/mens-admin/src/main/java/kr/xit/core/spring/auth/CustomAuthenticationEntryPoint.java @@ -27,15 +27,6 @@ public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { - -// ResultVO resultVO = new ResultVO(); -// resultVO.setResultCode(ResponseCode.AUTH_ERROR.getCode()); -// resultVO.setResultMessage(ResponseCode.AUTH_ERROR.getMessage()); -// ObjectMapper mapper = new ObjectMapper(); -// -// //Convert object to JSON string -// String jsonInString = mapper.writeValueAsString(resultVO); - // 403 에러 @SuppressWarnings("rawtypes") ApiResponseDTO apiResponseDTO = ApiResponseDTO.builder() @@ -49,5 +40,7 @@ public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint response.setCharacterEncoding("UTF-8"); response.getWriter().println(JsonUtils.toJson(apiResponseDTO)); + //TODO:: 페이지 생성후 처리 + //response.sendRedirect(""); } } diff --git a/mens-admin/src/main/java/kr/xit/core/spring/auth/SecurityConfig.java b/mens-admin/src/main/java/kr/xit/core/spring/auth/SecurityConfig.java index f171682..adf1fe8 100644 --- a/mens-admin/src/main/java/kr/xit/core/spring/auth/SecurityConfig.java +++ b/mens-admin/src/main/java/kr/xit/core/spring/auth/SecurityConfig.java @@ -89,11 +89,15 @@ public class SecurityConfig implements WebMvcConfigurer { .csrf().disable() //.cors().configurationSource(corsConfigurationSource()) .cors().and() - .formLogin().disable() - .httpBasic().disable() + //.formLogin().disable() + //.httpBasic().disable() .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) .and() .exceptionHandling() +// .authenticationEntryPoint( +// (request, response, authException) -> response.sendRedirect("")) +// .accessDeniedHandler( +// (request, response, accessDeniedException) -> response.sendRedirect("")) .authenticationEntryPoint(new CustomAuthenticationEntryPoint()) .accessDeniedHandler(new CustomAccessDeniedHandler()) .and() diff --git a/mens-admin/src/main/resources/config/application-app.yml b/mens-admin/src/main/resources/config/application-app.yml index 6d322e4..dff2fee 100644 --- a/mens-admin/src/main/resources/config/application-app.yml +++ b/mens-admin/src/main/resources/config/application-app.yml @@ -22,23 +22,8 @@ app: # Filter를 사용한 로그 출력 filter-enabled: false response-enabled: false - mdc: - enabled: true - exclude-patterns: '/api/kakao/(.*), /api/v1/ens/sendBulks(.*)' # slack slack-webhook: enabled: false url: https://hooks.slack.com/services/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 - - ssh: - host: 192.168.200.52 - port: 22 - id: administrator - passwd: 1q2w3e4r5t! - sg: - root-path: /SMSImage - ens-path: /ENSData - rcv: / - backup: /backup - err: /err diff --git a/mens-admin/src/main/resources/config/application-dev.yml b/mens-admin/src/main/resources/config/application-dev.yml index 740b74c..07fa155 100644 --- a/mens-admin/src/main/resources/config/application-dev.yml +++ b/mens-admin/src/main/resources/config/application-dev.yml @@ -75,29 +75,8 @@ app: request: custom-enabled: true response-enabled: true - # MDC logging trace 활성 - mdc: - enabled: true # slack slack-webhook: enabled: false url: https://hooks.slack.com/services/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 - - contract: - # milisecond - connection: - timeout: 60000 - readTimeout: 60000 - - kt: - host: http://211.43.10.163:10210/ONLWeb - api: - # 모바일페이지 : 본문자수신등록 callback url - 토큰인증확인 조회, 열람확인결과 전송 - dp-callback-url: http://${app.api-ip}:8081/api/biz/mbl/v1/kt/dpMblPage - me-callback-url: http://${app.api-ip}:8081/api/biz/mbl/v1/kt/meMblPage - - # 수신거부상태전송 : BC-AG-SN-014 - refuse-rcv: http://${app.api-ip}:8081/api/ens/kt/v1/receive/refuse - # 수신동의상태전송 : BC-AG-SN-015 - approve-rcv: http://${app.api-ip}:8081/api/ens/kt/v1/receive/approve diff --git a/mens-admin/src/main/resources/config/application-ens.yml b/mens-admin/src/main/resources/config/application-ens.yml deleted file mode 100644 index f0a87e3..0000000 --- a/mens-admin/src/main/resources/config/application-ens.yml +++ /dev/null @@ -1,88 +0,0 @@ -#----------------------------------------------------------------------- -# application 설정 -#----------------------------------------------------------------------- -app: - contract: - # milisecond - connection: - timeout: 120000 - readTimeout: 120000 - thread: - # 동시 실행 스레드 개수 - corePoolSize: 5 - # 스레드 풀에서 사용할 수 있는 최대 개수 - maxPoolSize: 10 - kakao: - bulk-max-cnt: 10 - host: https://docs-gw.kakaopay.com - # token: dd394da7f66211eb9cbe46e139ceffc2 - # uuid: CON-41ef0535f67211ebbdedd2e6ed332381 - api: - send: /v1/documents;POST - validToken: /v1/{document_binder_uuid}/tokens/{tokens};GET - modifyStatus: /v1/documents/{document_binder_uuid};POST - findStatus: /v1/documents/{document_binder_uuid}/status;GET - bulksend: /v1/documents/bulk;POST - bulkstatus: /v1/documents/bulk/status;POST - nice: - host: https://svc.niceapi.co.kr:22001 - # signgu-code: 11000 - # ffnlg-code: 11 - # client-id: 6c3eb1ff-530d-458a-9a6e-e02e3346f679 - # client-secret: 960f204ec45bb312b7ad2d6b54b984d9c353b8 - # product-id: 2101466024 - api: - generate-token: /digital/niceid/oauth/oauth/token - revoke-token: /digital/niceid/oauth/oauth/token/revokeById - publickey: /digital/niceid/api/v1.0/common/crypto/publickey - symmetrickey: /digital/niceid/api/v1.0/common/crypto/symmetrickey - ci: /digital/niceid/cert/v1.0/ipin/addinfo/ci - kt: - # vpn 사용 - host: http://172.16.0.13:10210/ONLWeb - # 운영 - #host: http://172.16.11.182:10210/ONLWeb - api: - # 토큰발행 - generate-token: /oauth/token - # 본문자수신등록 : BC-AG-SN-002 - main-send: /api/message/main/send - # 토큰인증확인조회 : BC-AG-SN-008 - cfm-token: /api/message/token - # 토큰열람확인결과전송 : BC-AG-SN-009 - read-token: /api/message/read - # 사전/본 문자 발송/수신 결과 전송 : BC-AG-SN-010 - result-message: /api/ag/message/result - - # 사전문자수신등록 : BC-AG-SN-001 - before-send: /api/message/before/send - # 수신거부등록 : BC-AG-SN-007 - blacklist: /api/blacklist - # 백오피스발송통계연계조회 : BC-AG-SN-011 - send-sttc: /api/sndsttc - # 백오피스발송결과연계조회 : BC-AG-SN-012 - send-sttcdtl: /api/sndsttcdtl - # whitelist등록 : BC-AG-SN-013 - whitelist: /api/whitelist - # 유통증명서발급처리 : BC-AG-SM-001 - cerf-acmd: /api/message/acmdcerf - # 기관정산화면연계토큰인증 : BC-AG-SM-002 - exca-token: /api/auth/excatoken - # 정산연계자료조회 : BC-AG-EC-001 - exca: /api/auth/exca - # 전자문서유통정보수치조회 : BC-AG-HS-001 - info-acmd: /api/acmdinfo - # 전자문서유통정보수치확인서 발급처리 : BC-AG-HS-002 - cfm-acmd: /api/acmdinfocfm - - pplus: - host: https://t.postplus.co.kr - api: - # 우편 제작 접수 - accept: /po/api/postplusPstMsrApi.do - # 우편 제작 상태 조회 - status: /po/api/postplusPstStatusApi.do - epost: - host: http://openapi.epost.go.kr - api: - postTrackInfo: /trace/retrieveLongitudinalCombinedService/retrieveLongitudinalCombinedService/getLongitudinalCombinedList diff --git a/mens-admin/src/main/resources/config/application-local.yml b/mens-admin/src/main/resources/config/application-local.yml index 59526d8..56c332b 100644 --- a/mens-admin/src/main/resources/config/application-local.yml +++ b/mens-admin/src/main/resources/config/application-local.yml @@ -85,45 +85,9 @@ app: request: custom-enabled: true response-enabled: true - # MDC logging trace 활성 - mdc: - enabled: true # slack slack-webhook: enabled: false url: https://hooks.slack.com/services/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 - ssh: - host: 211.119.124.9 - port: 22 - id: xituser - passwd: xituser!@ - sg: - root-path: /data/mens/sg-pni-cctv - ens-path: /data/mens/sg-ens-cctv - rcv: /rcv - backup: /backup - err: /err - - contract: - # milisecond - connection: - timeout: 60000 - readTimeout: 60000 - - kt: - # vpn 사용 - #host: http://172.16.0.13:10210/ONLWeb - host: http://211.43.10.163:10210/ONLWeb - api: - # 모바일페이지 : 본문자수신등록 callback url - 토큰인증확인 조회, 열람확인결과 전송 - dp-callback-url: http://${app.api-ip}:8080/api/web/mbl/v1/kt/dpMblPage.do - me-callback-url: http://${app.api-ip}:8080/api/web/mbl/v1/kt/meMblPage.do - #dp-callback-url: http://211.119.124.73:8081/api/biz/mbl/v1/kt/dpMblPage - #me-callback-url: http://211.119.124.73:8081/api/biz/mbl/v1/kt/meMblPage - - # 수신거부상태전송 : BC-AG-SN-014 - refuse-rcv: http://${app.api-ip}:8081/api/ens/kt/v1/receive/refuse - # 수신동의상태전송 : BC-AG-SN-015 - approve-rcv: http://${app.api-ip}:8081/api/ens/kt/v1/receive/approve diff --git a/mens-admin/src/main/resources/config/application-prod.yml b/mens-admin/src/main/resources/config/application-prod.yml index fc6764a..f80ba7e 100644 --- a/mens-admin/src/main/resources/config/application-prod.yml +++ b/mens-admin/src/main/resources/config/application-prod.yml @@ -74,32 +74,9 @@ app: request: common-enabled: true response-enabled: false - # MDC logging trace 활성 - mdc: - enabled: true # slack slack-webhook: enabled: false url: https://hooks.slack.com/services/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 - contract: - # milisecond - connection: - timeout: 20000 - readTimeout: 20000 - - kt: - # vpn 사용 - #host: http://172.16.0.13:10210/ONLWeb - # 운영 - host: http://172.16.11.182:10210/ONLWeb - api: - # 모바일페이지 : 본문자수신등록 callback url - 토큰인증확인 조회, 열람확인결과 전송 - dp-callback-url: https://ens.sisul.or.kr/api/web/mbl/v1/kt/dpMblPage.do - me-callback-url: https://ens.sisul.or.kr/api/web/mbl/v1/kt/meMblPage.do - - # 수신거부상태전송 : BC-AG-SN-014 - refuse-rcv: http://${app.api-ip}:8081/api/ens/kt/v1/receive/refuse - # 수신동의상태전송 : BC-AG-SN-015 - approve-rcv: http://${app.api-ip}:8081/api/ens/kt/v1/receive/approve diff --git a/mens-admin/src/main/resources/config/application.yml b/mens-admin/src/main/resources/config/application.yml index 7b0c9b3..95c7ce1 100644 --- a/mens-admin/src/main/resources/config/application.yml +++ b/mens-admin/src/main/resources/config/application.yml @@ -25,7 +25,7 @@ app: security: white-list: /, - /biz/auth/**, + /auth/login /api-docs/**, /swagger-resources, /swagger-ui.html, @@ -57,7 +57,6 @@ spring: - common - auth - app - - ens batch: jdbc: