Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f4f244e
Merge pull request #7 from jejugom/NHDR-108-feat-mongodb์—ฐ๊ฒฐ-hye
NahyeChoi Jul 23, 2025
6692385
Merge branch 'develop'
guno-p Aug 5, 2025
cb75706
refactor: application.properties -> application-dev.properties
guno-p Aug 5, 2025
eef4076
Revert "refactor: application.properties -> application-dev.properties"
guno-p Aug 5, 2025
5c373d0
refactor: ci-cd.yml runner ๊ถŒํ•œ ๋ถ€์—ฌ
guno-p Aug 5, 2025
5bdf5bb
refactor: ci-cd.yml EC2 sudo ๊ถŒํ•œ ๋ถ€์—ฌ
guno-p Aug 5, 2025
b810e92
refactor: application.properties ๋‚ด์šฉ ์ œ๊ฑฐ
guno-p Aug 5, 2025
a5b853d
Merge pull request #43 from jejugom/NHDR-190-๋ฐฐํฌ-guno
guno-p Aug 5, 2025
f985599
[NHDR-204] ๋ฐฑ์—”๋“œ ๋ฐฐํฌ ์ž‘๋™ ํ…Œ์ŠคํŠธ ์ถ”๊ฐ€
guno-p Aug 5, 2025
d7b3e22
[NHDR-204] application.properties ์‚ญ์ œ
guno-p Aug 5, 2025
56ab952
Merge pull request #50 from jejugom/NHDR-204-๋ฐฑ์—”๋“œ-๋ฐฐํฌ-์ž‘๋™-ํ…Œ์ŠคํŠธ-guno
guno-p Aug 5, 2025
d8ccd8a
[NHDR-204] cors ํ•„ํ„ฐ ์ถ”๊ฐ€
guno-p Aug 6, 2025
b5fa29e
Merge pull request #51 from jejugom/NHDR-204-๋ฐฑ์—”๋“œ-๋ฐฐํฌ-์ž‘๋™-ํ…Œ์ŠคํŠธ-guno
guno-p Aug 6, 2025
ffc7412
Merge branch 'main' into NHDR-218-๋ฐฐํฌ-๋ฐฑ์—”๋“œ-guno
guno-p Aug 8, 2025
8e1c8a1
Merge pull request #57 from jejugom/NHDR-218-๋ฐฐํฌ-๋ฐฑ์—”๋“œ-guno
guno-p Aug 8, 2025
6bf813c
feat: ์˜ˆ์•ฝ๊ฒฐ๊ณผ ์ˆ˜์ •
guno-p Aug 8, 2025
3928565
Merge pull request #62 from jejugom/simple-fix-for-main-update
guno-p Aug 8, 2025
c1210c2
trigger rebuild
guno-p Aug 9, 2025
a9dfee9
trigger rebuild
guno-p Aug 9, 2025
c5c60e2
trigger rebuild
guno-p Aug 9, 2025
f4b3b62
Merge branch 'main' into develop
guno-p Aug 13, 2025
f100a5c
Merge pull request #81 from jejugom/hotfix-resolve-conflicts
guno-p Aug 13, 2025
085d8d8
emptyCommitForDeployment
guno-p Aug 13, 2025
e484c94
Merge pull request #82 from jejugom/hotfix-resolve-conflicts
guno-p Aug 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ jobs:
- name: Build WAR file
run: ./gradlew clean build -x test

- name: Add runner user to docker group
run: |
sudo usermod -aG docker $USER
newgrp docker

- name: DockerHub Login & Push
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
Expand Down Expand Up @@ -79,8 +84,8 @@ jobs:
username: ubuntu
key: ${{ secrets.EC2_PRIVATE_KEY }}
script: |
docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
docker pull ${{ secrets.DOCKER_USERNAME }}/jejugom
docker-compose down
docker-compose up -d
docker image prune -f
sudo docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
sudo docker pull ${{ secrets.DOCKER_USERNAME }}/jejugom
sudo docker-compose down
sudo docker-compose up -d
sudo docker image prune -f
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,10 @@ public ResponseEntity<HomeResponseDto> getHome(Authentication authentication) {
String email = authentication.getName();
return ResponseEntity.ok(homeService.getHomeData(email));
}

@ApiOperation(value = "ํ…Œ์ŠคํŠธ ์—”๋“œํฌ์ธํŠธ", notes = "๋ฐฐํฌ ํ…Œ์ŠคํŠธ์šฉ ๊ฐ„๋‹จํ•œ GET ์—”๋“œํฌ์ธํŠธ์ž…๋‹ˆ๋‹ค.")
@GetMapping("/test")
public ResponseEntity<String> test(){
return ResponseEntity.ok("Hello from JejuGom Server! Deployment test successful.");
}
}
Empty file.
5 changes: 4 additions & 1 deletion src/main/java/org/scoula/security/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Override
public void configure(HttpSecurity http) throws Exception {
// ํ•„ํ„ฐ ์ˆœ์„œ ์„ค์ •: ์ธ์ฝ”๋”ฉ ํ•„ํ„ฐ -> JWT ์ธ์ฆ ํ•„ํ„ฐ -> Spring Security ๊ธฐ๋ณธ ํ•„ํ„ฐ
http.addFilterBefore(encodingFilter(), UsernamePasswordAuthenticationFilter.class)
http.cors() // CORS ํ•„ํ„ฐ ์ถ”๊ฐ€
.and()
.addFilterBefore(encodingFilter(), UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);

// stateless REST API ์„ค์ •์„ ์œ„ํ•ด ๊ธฐ๋ณธ ๋ณด์•ˆ ๊ธฐ๋Šฅ ๋น„ํ™œ์„ฑํ™”
Expand All @@ -67,6 +69,7 @@ public void configure(HttpSecurity http) throws Exception {
"/",
"/favicon.ico",
"/api/home",
"/api/home/test",
"/auth/kakao",
"/auth/kakao/callback",
"/api/retirement",
Expand Down