From ed2b5f17f7f68e8948420fbced36ef385be007bc Mon Sep 17 00:00:00 2001 From: Wibaek Park <34394229+wibaek@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:12:48 +0900 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20release=20github=20action=20?= =?UTF-8?q?=EC=9E=84=EC=9D=98=20=EC=8B=A4=ED=96=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac375db23..7bf1a0ddd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,7 @@ name: Build Gradle and Deploy on: push: branches: [ "release" ] + workflow_dispatch: jobs: build-gradle: From 2af7b77ff8bb48bb42889f8bd695c1002a80e39f Mon Sep 17 00:00:00 2001 From: Yeongseo Na Date: Tue, 28 Jan 2025 00:24:54 +0900 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=EA=B8=B0=EB=B3=B8=20=EC=B6=94?= =?UTF-8?q?=EC=B2=9C=20=EB=8C=80=ED=95=99=20=ED=9B=84=EB=B3=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#161)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../university/service/GeneralRecommendUniversities.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/solidconnection/university/service/GeneralRecommendUniversities.java b/src/main/java/com/example/solidconnection/university/service/GeneralRecommendUniversities.java index 5c1c2e787..92054eee6 100644 --- a/src/main/java/com/example/solidconnection/university/service/GeneralRecommendUniversities.java +++ b/src/main/java/com/example/solidconnection/university/service/GeneralRecommendUniversities.java @@ -31,7 +31,8 @@ public class GeneralRecommendUniversities { "오스트라바 대학", "RMIT멜버른공과대학(A형)", "알브슈타트 지그마링엔 대학", "뉴저지시티대학(A형)", "도요대학", "템플대학(A형)", "빈 공과대학교", "리스본대학 공과대학", "바덴뷔르템베르크 산학협력대학", "긴다이대학", "네바다주립대학 라스베이거스(B형)", "릴 가톨릭 대학", - "그라츠공과대학", "그라츠 대학", "코펜하겐 IT대학", "메이지대학", "분쿄가쿠인대학", "린츠 카톨릭 대학교" + "그라츠공과대학", "그라츠 대학", "코펜하겐 IT대학", "메이지대학", "분쿄가쿠인대학", "린츠 카톨릭 대학교", + "밀라노공과대학", "장물랭리옹3세대학교", "시드니대학", "아우크스부르크대학", "쳄니츠 공과대학", "북경외국어대학교 IBS" ); @Value("${university.term}") From 5dc19c355c645d5de962a059162aed2fd434740c Mon Sep 17 00:00:00 2001 From: seonghyeok Date: Tue, 26 Aug 2025 18:19:19 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20config.alloy=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.dev.yml | 2 +- docker-compose.prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a37ef4c55..84e50d350 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -41,6 +41,6 @@ services: - "12345:12345" volumes: - ./logs:/var/log/spring - - ./docs/config.alloy:/etc/alloy/config.alloy:ro + - ./docs/infra-conf/config.alloy:/etc/alloy/config.alloy:ro environment: - ALLOY_ENV=dev diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 30b0c9fc1..73d7f524e 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -40,6 +40,6 @@ services: - "12345:12345" volumes: - ./logs:/var/log/spring - - ./docs/config.alloy:/etc/alloy/config.alloy:ro + - ./docs/infra-config/config.alloy:/etc/alloy/config.alloy:ro environment: - ALLOY_ENV=production From 99bc01be025bc5dad698c7bc25ae03a7e9a8e61c Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 26 Aug 2025 21:46:36 +0900 Subject: [PATCH 4/5] =?UTF-8?q?hotfix:=20=EB=AA=A8=EC=9D=98=EC=A7=80?= =?UTF-8?q?=EC=9B=90=20=ED=98=84=ED=99=A9=20=EC=96=B4=EB=93=9C=EB=AF=BC=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/controller/ApplicationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java b/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java index 07571d060..becd3f273 100644 --- a/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java +++ b/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java @@ -39,7 +39,7 @@ public ResponseEntity apply( .body(applicationSubmissionResponse); } - @RequireRoleAccess(roles = {Role.ADMIN}) + // @RequireRoleAccess(roles = {Role.ADMIN}) // todo : 추후 어드민 페이지에서 권한 변경 기능 추가 필요 @GetMapping public ResponseEntity getApplicants( @AuthorizedUser long siteUserId, From aa60ef0c1ae63bd781f617b322952e3641073945 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Tue, 26 Aug 2025 21:48:16 +0900 Subject: [PATCH 5/5] =?UTF-8?q?hotfix:=20import=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/controller/ApplicationController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java b/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java index becd3f273..c388f8b25 100644 --- a/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java +++ b/src/main/java/com/example/solidconnection/application/controller/ApplicationController.java @@ -6,8 +6,6 @@ import com.example.solidconnection.application.service.ApplicationQueryService; import com.example.solidconnection.application.service.ApplicationSubmissionService; import com.example.solidconnection.common.resolver.AuthorizedUser; -import com.example.solidconnection.security.annotation.RequireRoleAccess; -import com.example.solidconnection.siteuser.domain.Role; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus;