Develop

.github/workflows/dockerhub-ci.yml

@@ -2,9 +2,9 @@ name: docker-ci
 
 on:
   push:
-    branches: [ "develop", "main" ]   # develop: 빌드만, main: 빌드+푸시
+    branches: [ "develop", "main" ]
   pull_request:
-    branches: [ "main" ]              # main 대상 PR 생성/업데이트 시 빌드+푸시
+    branches: [ "main" ]
 
 jobs:
   build-and-push:
@@ -17,67 +17,62 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
 
+      # Node 설치 (JS/CSS 빌드를 위한)
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "npm"
+
+      - name: Install npm dependencies
+        run: |
+          if [ -f package.json ]; then
+            npm install
+          fi
+
+      # JDK 설치
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '17'
           cache: gradle
 
+      # Spring Boot 빌드 (JS/CSS 포함)
       - name: Build Spring Boot JAR
         run: ./gradlew clean bootJar --no-daemon
 
-      - name: Docker metadata (이미지 태그 자동 생성)
+      # 🤝 Dockerfile에 COPY app.jar 하기 위해 파일명 통일
+      - name: Prepare JAR for docker build
+        run: cp build/libs/*.jar app.jar
+
+      # Docker metadata
+      - name: Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}
           tags: |
-            # 공통
             type=sha,format=short
-            # 브랜치 push 시 (develop/main)
             type=ref,event=branch
-            # PR 시 (main 대상)
             type=ref,event=pr
-            # main push일 때 latest 추가
             type=raw,value=latest,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
 
-      # ✅ DockerHub 로그인: main push 또는 main 대상 PR에서만
+      # 로그인 (main push 또는 main PR일 때만)
       - name: Login to DockerHub
         if: github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.base_ref == 'main')
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # 🚫 Alibaba Cloud ACR 관련 단계 (나중 대비용 주석 유지)
-      # - name: Login to Alibaba Cloud ACR
-      #   if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main')
-      #   uses: docker/login-action@v3
-      #   with:
-      #     registry: cooperation-center-registry.cn-beijing.cr.aliyuncs.com
-      #     username: ${{ secrets.ACR_USERNAME }}
-      #     password: ${{ secrets.ACR_PASSWORD }}
-
-      # - name: (옵션) Build & Push to ACR
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     context: .
-      #     push: true
-      #     tags: |
-      #       cooperation-center-registry.cn-beijing.cr.aliyuncs.com/${{ secrets.ACR_NAMESPACE }}/${{ github.event.repository.name }}:${{ github.sha }}
-      #       cooperation-center-registry.cn-beijing.cr.aliyuncs.com/${{ secrets.ACR_NAMESPACE }}/${{ github.event.repository.name }}:pr-${{ github.event.pull_request.number }}
-      #       cooperation-center-registry.cn-beijing.cr.aliyuncs.com/${{ secrets.ACR_NAMESPACE }}/${{ github.event.repository.name }}:latest
-
-      # ✅ Build & Push (조건부 푸시)
-      - name: Build and (conditionally) Push Docker image (Docker Hub)
+      # 이미지 빌드 & 푸시
+      - name: Build and Push Docker Image
         uses: docker/build-push-action@v6
         with:
           context: .
-          # develop push: false (빌드만)
-          # main push: true (푸시)
-          # main 대상 PR: true (푸시)
-          push: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'pull_request' && github.base_ref == 'main') }}
+          push: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main')
+                    || (github.event_name == 'pull_request' && github.base_ref == 'main') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -38,3 +38,4 @@ out/
 
 ### VS Code ###
 .vscode/
+/node_modules

Dockerfile

@@ -1,17 +1,16 @@
-# --- build stage ---
-FROM eclipse-temurin:17-jdk AS build
-WORKDIR /src
-COPY . .
-RUN ./gradlew clean bootJar --no-daemon
-
-# --- run stage ---
+# --- run stage only ---
 FROM eclipse-temurin:17-jre
+
 WORKDIR /app
-COPY --from=build /src/build/libs/*.jar app.jar
+
+# GitHub Actions에서 만든 jar 파일을 COPY
+COPY app.jar app.jar
 
 ENV JAVA_OPTS="-XX:MaxRAMPercentage=75"
 EXPOSE 8080
+
 HEALTHCHECK --interval=30s --timeout=3s --retries=3 \
   CMD wget -qO- http://127.0.0.1:8080/check/health || exit 1
+
 USER 1000
 ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar app.jar"]

api.md

@@ -0,0 +1,88 @@
+# API Documentation
+
+이 문서는 Cooperation Center 프로젝트의 API를 역할과 기능 중심으로 정리합니다.
+
+## 1. 사용자 / 인증 (User / Authentication)
+
+| 기능 | HTTP Method | API Endpoint | 정의 위치 (Controller) | 프론트엔드 사용처 |
+| --- | --- | --- | --- | --- |
+| 회원가입 | `POST` | `/api/v1/member/signup` | `MemberRestController.java` | `homepage/user/signup.html` |
+| 아이디(이메일) 중복 확인 | `GET` | `/api/v1/member/check-id` | `MemberRestController.java` | `homepage/user/signup.html` (동적 URL) |
+| 로그인 | `POST` | `/api/v1/member/login` | `MemberRestController.java` | `homepage/user/login.html` |
+| 로그아웃 | `POST` | `/api/v1/member/logout` | `MemberRestController.java` | - |
+| 토큰 재발급 | `POST` | `/api/v1/member/refresh` | `MemberRestController.java` | - |
+| 비밀번호 재설정 이메일 발송 | `POST` | `/api/v1/member/reset/email` | `MemberRestController.java` | `homepage/user/forgetPassword.html` |
+| 비밀번호 재설정 | `POST` | `/api/v1/member/reset/password` | `MemberRestController.java` | `homepage/user/resetPassword.html` |
+| 회원 정보 수정 | `PATCH` | `/api/v1/profile/member` | `MemberProfileRestController.java` | `homepage/user/member/profile.html` |
+| 유학원 정보 수정 | `PATCH` | `/api/v1/profile/agency` | `MemberProfileRestController.java` | `homepage/user/member/profile.html` |
+| 사업자등록증 수정 | `PATCH` | `/api/v1/profile/businessCert` | `MemberProfileRestController.java` | `homepage/user/member/profile.html` |
+| 유학원 대표사진 수정 | `PATCH` | `/api/v1/profile/agencyPicture` | `MemberProfileRestController.java` | `homepage/user/member/profile.html` |
+| **[관리자]** 로그인 페이지 | `GET` | `/admin/login` | `MemberAdminController.java` | - |
+| **[관리자]** 로그인 | `POST` | `/api/v1/admin/login` | `MemberAdminRestController.java` | `adminpage/user/login.html` |
+| **[관리자]** 로그아웃 | `GET` | `/admin/logout` | `MemberAdminController.java` | - |
+| **[관리자]** 로그인 기록 조회 | `GET` | `/api/v1/admin/login/log` | `MemberAdminRestController.java` | `adminpage/user/index.html` |
+| **[관리자]** 회원가입 승인 | `POST` | `/api/v1/admin/accept/{memberEmail}` | `MemberAdminRestController.java` | `adminpage/user/index.html` |
+| **[관리자]** 회원가입 보류 | `POST` | `/api/v1/admin/pending/{memberEmail}` | `MemberAdminRestController.java` | - |
+| **[관리자]** 회원 상세 정보 조회 | `GET` | `/api/v1/admin/detail/{memberEmail}` | `MemberAdminRestController.java` | `adminpage/user/member/manageUser.html` |
+
+## 2. 학생 데이터 (Student Data)
+
+| 기능 | HTTP Method | API Endpoint | 정의 위치 (Controller) | 프론트엔드 사용처 |
+| --- | --- | --- | --- | --- |
+| **[관리자]** 모든 학생 정보 조회 | `GET` | `/api/v1/admin/students` | `StudentAdminRestController.java` | - |
+| **[관리자]** 학생 상세 정보 조회 | `GET` | `/api/v1/admin/students/{id}` | `StudentAdminRestController.java` | `adminpage/user/student/studentList.html` |
+| **[관리자]** 학생 정보 Excel 다운로드 | `GET` | `/api/v1/admin/students/download` | `StudentAdminRestController.java` | `adminpage/user/student/studentList.html` |
+
+## 3. 설문조사 (Survey)
+
+| 기능 | HTTP Method | API Endpoint | 정의 위치 (Controller) | 프론트엔드 사용처 |
+| --- | --- | --- | --- | --- |
+| 설문조사 목록 조회 | `GET` | `/api/v1/survey/list` | `SurveyRestController.java` | `adminpage/user/student/studentList.html` |
+| 설문조사 상세 조회 | `GET` | `/{surveyId}` | `SurveyRestController.java` | `homepage/user/survey/survey-answer.html` |
+| 설문조사 답변 제출 | `POST` | `/api/v1/survey/answer` | `SurveyRestController.java` | `homepage/user/survey/survey-answer.html` |
+| QR 코드 생성 | `GET` | `/api/v1/survey/qr` | `SurveyRestController.java` | `homepage/user/survey/survey-list-admin.html` |
+| **[관리자]** 설문조사 생성 | `POST` | `/api/v1/survey/admin/make` | `SurveyRestController.java` | `homepage/user/survey/survey-make.html` |
+| **[관리자]** 설문조사 수정 | `PATCH` | `/api/v1/survey/admin/edit` | `SurveyRestController.java` | `homepage/user/survey/survey-make.html` |
+| **[관리자]** 설문조사 삭제 | `DELETE` | `/api/v1/survey/admin/{surveyId}` | `SurveyRestController.java` | `homepage/user/survey/survey-list-admin.html` |
+| **[관리자]** 설문조사 복사 | `POST` | `/api/v1/survey/admin/copy/{surveyId}` | `SurveyRestController.java` | `homepage/user/survey/survey-list-admin.html` |
+| **[관리자]** 설문조사 템플릿 조회 | `GET` | `/api/v1/survey/admin/template` | `SurveyRestController.java` | `homepage/user/survey/survey-make.html` |
+| **[관리자]** 설문조사 답변 로그 조회 | `GET` | `/api/v1/survey/admin/answer/{surveyId}` | `SurveyRestController.java` | - |
+| **[관리자]** 답변 로그 CSV 추출 | `POST` | `/api/v1/survey/admin/log/csv` | `SurveyRestController.java` | `homepage/user/survey/survey-answer-log.html` |
+| **[관리자]** 답변 로그 전체 CSV 추출 | `POST` | `/api/v1/survey/admin/log/{surveyId}` | `SurveyRestController.java` | `homepage/user/survey/survey-answer-log.html` |
+| **[관리자]** 학생별 파일 다운로드 | `POST` | `/api/v1/survey/admin/log/file/student/{surveyId}` | `SurveyRestController.java` | `homepage/user/survey/survey-answer-log.html` |
+| **[관리자]** 문항별 파일 다운로드 | `POST` | `/api/v1/survey/admin/log/file/survey/{surveyId}` | `SurveyRestController.java` | `homepage/user/survey/survey-answer-log.html` |
+| **[관리자]** 폴더 관리 | `GET`, `POST`, `PATCH`, `DELETE` | `/api/v1/survey/admin/folders` | `SurveyRestController.java` | `homepage/user/survey/survey-folder-list.html` |
+
+## 4. 학교 / 게시판 (School / Board)
+
+| 기능 | HTTP Method | API Endpoint | 정의 위치 (Controller) | 프론트엔드 사용처 |
+| --- | --- | --- | --- | --- |
+| **[관리자]** 학교 정보 저장 | `POST` | `/api/v1/admin/school/save` | `SchoolAdminRestController.java` | - |
+| **[관리자]** 게시판 생성/삭제 | `POST`, `DELETE` | `/api/v1/admin/school/board` | `SchoolAdminRestController.java` | `adminpage/user/school/manageSchool.html` |
+| **[관리자]** 게시글 관리 | `POST`, `PATCH`, `DELETE`, `GET` | `/api/v1/admin/school/post` | `SchoolAdminRestController.java` | `adminpage/user/school/manageSchool.html` |
+| **[관리자]** 게시글 목록 조회 | `GET` | `/api/v1/admin/school/posts` | `SchoolAdminRestController.java` | `adminpage/user/school/manageSchool.html` |
+| **[관리자]** 파일 게시글 관리 | `POST`, `GET`, `PATCH`, `DELETE` | `/api/v1/admin/school/file` | `SchoolAdminRestController.java` | `adminpage/user/school/manageSchool.html` |
+| **[관리자]** 학사일정 관리 | `POST`, `GET`, `PATCH`, `DELETE` | `/api/v1/admin/school/schedule` | `SchoolAdminRestController.java` | `adminpage/user/school/manageSchool.html` |
+| **[관리자]** 학사일정 목록 조회 | `GET` | `/api/v1/admin/school/schedules` | `SchoolAdminRestController.java` | `adminpage/user/school/manageSchool.html` |
+
+## 5. 유학원 (Agency)
+
+| 기능 | HTTP Method | API Endpoint | 정의 위치 (Controller) | 프론트엔드 사용처 |
+| --- | --- | --- | --- | --- |
+| 유학원 지역 목록 조회 | `GET` | `/api/v1/agency/region` | `AgencyRestController.java` | `homepage/user/member/profile.html` |
+
+## 6. 파일 관리 (File Management)
+
+| 기능 | HTTP Method | API Endpoint | 정의 위치 (Controller) | 프론트엔드 사용처 |
+| --- | --- | --- | --- | --- |
+| 이미지 조회 | `GET` | `/api/v1/file/img/{type}/{fileId}` | `FileRestController.java` | `adminpage/user/school/manageSchool.html` (SunEditor), `homepage/user/school/school-board.html` |
+| 파일 다운로드 | `GET` | `/api/v1/file/{type}/{fileId}` | `FileRestController.java` | `homepage/user/school/school-board.html` |
+| PDF 조회 | `GET` | `/api/v1/file/pdf/{type}/{fileId}` | `FileRestController.java` | - |
+| 파일 업로드 | `POST` | `/api/v1/file/{type}` | `FileRestController.java` | - |
+| OSS 파일 업로드 | `POST` | `/api/v1/oss/upload` | `OssController.java` | - |
+
+## 7. 외부 연동 (External Integration)
+
+| 기능 | HTTP Method | API Endpoint | 정의 위치 (Controller) | 프론트엔드 사용처 |
+| --- | --- | --- | --- | --- |
+| 주소 검색 제안 (Tencent) | `GET` | `/api/v1/tencent/address` | `MemberAddressController.java` | `homepage/user/member/profile.html`, `homepage/user/signup.html` |

babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: [['@babel/preset-env', {targets: {node: 'current'}}]],
+};

build.gradle

@@ -2,6 +2,7 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.5.0'
 	id 'io.spring.dependency-management' version '1.1.7'
+    id 'com.github.node-gradle.node' version '7.0.2'
 }
 
 group = 'com.cooperation.project'
@@ -67,6 +68,24 @@ dependencies {
 
 }
 
+node {
+    version = '20.17.0'
+    download = true
+    workDir = file("${project.buildDir}/nodejs")
+    npmWorkDir = file("${project.buildDir}/npm")
+    nodeProjectDir = file("${project.projectDir}")
+}
+
+tasks.register('bundlingJsCss', com.github.gradle.node.npm.task.NpmTask) {
+    group = 'build'
+    description = 'Bundling JavaScript and Tailwind CSS using npm/rollup'
+    args = ['run', 'build']
+}
+
+tasks.named('processResources') {
+    dependsOn(tasks.named('bundlingJsCss'))
+}
+
 tasks.named('test') {
 	useJUnitPlatform()
 }