diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index cf7b0e6..535e0a3 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -20,27 +20,34 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
- java-version: '11'
+ java-version: '17'
- # 3. Spring Boot 애플리케이션 빌드
+ # 3. Gradlew 실행 권한 부여
+ - name: Grant execute permission for Gradlew
+ working-directory: ./2024-UCD_WEB_SERVER # Spring Boot 프로젝트 폴더 경로
+ run: chmod +x gradlew
+
+ # 4. Spring Boot 애플리케이션 빌드
- name: Build with Gradle
- run: ./gradlew build
+ working-directory: ./2024-UCD_WEB_SERVER # Spring Boot 프로젝트 폴더로 이동
+ run: ./gradlew clean build -x test
- # 4. Docker 이미지 빌드
+ # 5. Docker 이미지 빌드
- name: Build Docker image
+ working-directory: ./2024-UCD_WEB_SERVER # Docker 빌드를 위해 동일 경로 설정
run: |
docker build -t eotaegyu/keynote.app:latest .
- # 5. Docker Hub 로그인 (GitHub Secrets 사용)
+ # 6. Docker Hub 로그인 (GitHub Secrets 사용)
- name: Log in to Docker Hub
- run: echo "${{ secrets.DOCKERHUB_USERNAME }}:${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+ run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
- # 6. Docker Hub에 이미지 푸시
+ # 7. Docker Hub에 이미지 푸시
- name: Push Docker image to Docker Hub
run: |
docker push eotaegyu/keynote.app:latest
- # GCP 인스턴스에서 Docker 이미지를 풀링하고 업데이트하는 단계
+ # GCP 인스턴스에서 Docker 이미지를 풀링하고 업데이트하는 단계.
deploy:
runs-on: ubuntu-latest
needs: build
@@ -54,6 +61,6 @@ jobs:
key: ${{ secrets.GCP_SSH_PRIVATE_KEY }}
port: 22
script: |
- docker pull eotaegyu/keynote.a
- docker-compose down
- docker-compose up -d
+ sudo docker pull eotaegyu/keynote.app:latest
+ sudo docker-compose down
+ sudo docker-compose up -d
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2d4d03a..0bbc10c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,14 @@
-
-
-
-
-
+
+
+
+
+
+
+
@@ -27,7 +29,12 @@
-
+
+
+
+
+
+
@@ -48,22 +55,28 @@
- {
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "git-widget-placeholder": "main",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "C:/Users/wkdrn/Desktop/ucd/2024-UCD_WEB_SERVER",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
+
+
+
+
+
+
@@ -75,10 +88,24 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/2024-UCD_WEB_SERVER/src/main/java/com/ucd/keynote/domain/category/service/CategoryService.java b/2024-UCD_WEB_SERVER/src/main/java/com/ucd/keynote/domain/category/service/CategoryService.java
index 30f0a72..23615dc 100644
--- a/2024-UCD_WEB_SERVER/src/main/java/com/ucd/keynote/domain/category/service/CategoryService.java
+++ b/2024-UCD_WEB_SERVER/src/main/java/com/ucd/keynote/domain/category/service/CategoryService.java
@@ -59,7 +59,7 @@ public List getCategories(Long channelId){
.map(category -> CategoryResponseDTO.builder()
.categoryId(category.getCategoryId())
.name(category.getName())
- .channelId(channel.getChannelId())
+ .channelId(channelId)
.createdAt(category.getCreatedAt())
.build())
.collect(Collectors.toList());
diff --git a/erd.png b/mysql/erd.png
similarity index 100%
rename from erd.png
rename to mysql/erd.png
diff --git a/gitmessage.txt b/mysql/gitmessage.txt
similarity index 100%
rename from gitmessage.txt
rename to mysql/gitmessage.txt
diff --git a/keynot_SQL.sql b/mysql/keynot_SQL.sql
similarity index 100%
rename from keynot_SQL.sql
rename to mysql/keynot_SQL.sql
diff --git a/keynote.png b/mysql/keynote.png
similarity index 100%
rename from keynote.png
rename to mysql/keynote.png
diff --git a/keynote_erd.mwb b/mysql/keynote_erd.mwb
similarity index 100%
rename from keynote_erd.mwb
rename to mysql/keynote_erd.mwb
diff --git a/keynote_erd.mwb.bak b/mysql/keynote_erd.mwb.bak
similarity index 100%
rename from keynote_erd.mwb.bak
rename to mysql/keynote_erd.mwb.bak