Merged
Conversation
[DEPLOY] v1.0.2
sengjun0624
requested review from
YoungjaeRo,
Copilot,
iamyuunzo,
jeongmin07262 and
noeyoes
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR resolves merge conflicts by integrating changes from the main branch into the development branch. Key changes include:
- Adding a production server configuration for Swagger API documentation.
- Updating security rules to permit specific admin API endpoints.
- Minor formatting adjustments in CORS configuration.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/main/java/dev/admin/global/config/SwaggerConfig.java | Added a production server entry to the OpenAPI servers list |
| src/main/java/dev/admin/global/config/SecurityConfig.java | Updated permitted endpoints and restructured security matchers for admin API endpoints |
| src/main/java/dev/admin/global/config/CorsConfig.java | Formatting update with an extra blank line |
Comments suppressed due to low confidence (2)
src/main/java/dev/admin/global/config/SwaggerConfig.java:48
- The production server is currently labeled as 'Local development server'. Consider updating the description to 'Production server' to avoid confusion.
.description("Local development server");
src/main/java/dev/admin/global/config/SecurityConfig.java:46
- [nitpick] Review the ordering of security rules: ensure that the authenticated matcher for '/admin-api/**' does not inadvertently override the earlier permitAll rules for the specified endpoints.
.requestMatchers("/admin-api/me", "/admin-api/**").authenticated()
sengjun0624
added a commit
that referenced
this pull request
Jun 4, 2025
* ♻️ refactor: HealthCheck Controller가 Security에 안걸리게 수정 (#54) * [MAIN] 메인 충돌 해결 (#56) * [DEPLOY] v1.0.1 (#45) * ♻️ refactor: Update CorsFilter (#40) * ✨ Feat: Add Unified Log Service (#42) * ✨ feat: Add Unified Log Service * ♻️ refactor: Modify DateTime Type * ♻️ refactor: Add UnifiedLogResponseDto (#44) * REFACTOR: admin -> admin-api 수정 및 TransactionType 추가 (#51) (#52) * [DEPLOY] v1.0.4 (#55) * REFACTOR: admin -> admin-api 수정 및 TransactionType 추가 (#51) * ♻️ refactor: HealthCheck Controller가 Security에 안걸리게 수정 (#54) --------- Co-authored-by: 조윤주 <155442976+iamyuunzo@users.noreply.github.com> --------- Co-authored-by: 조윤주 <155442976+iamyuunzo@users.noreply.github.com> * 🐛 fix: HealthCheck Controller가 고정 URL 이던 부분 수정 (#58) --------- Co-authored-by: 조윤주 <155442976+iamyuunzo@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📍 PR 타입 (하나 이상 선택)
❗️ 관련 이슈 링크
Close #
📌 개요
🔁 변경 사항
📸 스크린샷 (선택)
👀 기타 더 이야기해볼 점 (선택)
💬 리뷰 요구사항 (선택)
✅ 체크 리스트