diff --git a/build.gradle b/build.gradle
index cb284ad..24e3c18 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,6 +62,9 @@ dependencies {
 	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
 	implementation "org.springframework.boot:spring-boot-starter-mail"
 
+	//swagger
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13'
+
 }
 
 tasks.named('test') {
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/file/service/FileService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/file/service/FileService.java
index 01ad6dc..55cc689 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/file/service/FileService.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/file/service/FileService.java
@@ -202,48 +202,6 @@ public InputStream openObject(String key) {
         return obj.getObjectContent(); // 반드시 호출 측에서 close
     }
 
-//    public ResponseEntity<Resource> viewImage(String fileId,String type) throws IOException {
-//        FileTargetType fileType = FileTargetType.fromType(type);
-//        FileAttachment file = fileAttachmentRepository.findByFileIdAndFiletype(fileId,fileType)
-//                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "파일을 찾을 수 없습니다."));
-//        Path filePath = Paths.get(file.getPath()).resolve(file.getStoredName());
-//        Resource resource = new UrlResource(filePath.toUri());
-//        if (!resource.exists() || !resource.isReadable()) {
-//            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "파일을 읽을 수 없습니다.");
-//        }
-//
-//        String contentType = Files.probeContentType(filePath);
-//        if (contentType == null) {
-//            contentType = MediaType.APPLICATION_OCTET_STREAM_VALUE;
-//        }
-//        return ResponseEntity.ok()
-//                .contentType(MediaType.parseMediaType(contentType))
-//                .body(resource);
-//    }
-//
-//    public ResponseEntity<Resource> viewPdf(String fileId, String type) throws IOException {
-//        FileTargetType fileType = FileTargetType.fromType(type);
-//        FileAttachment file = fileAttachmentRepository.findByFileIdAndFiletype(fileId, fileType)
-//                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "파일을 찾을 수 없습니다."));
-//
-//        Path filePath = Paths.get(file.getPath()).resolve(file.getStoredName());
-//        Resource resource = new UrlResource(filePath.toUri());
-//
-//        if (!resource.exists() || !resource.isReadable()) {
-//            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "파일을 읽을 수 없습니다.");
-//        }
-//
-//        String contentType = Files.probeContentType(filePath);
-//        if (contentType == null) {
-//            contentType = MediaType.APPLICATION_PDF_VALUE; // 기본값을 PDF로 설정
-//        }
-//
-//        return ResponseEntity.ok()
-//                .contentType(MediaType.parseMediaType(contentType))
-//                .header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + resource.getFilename() + "\"")
-//                .body(resource);
-//    }
-
     @Transactional
     public void deleteFile(FileAttachment fileAttachment){
         try{
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/controller/homepage/MemberProfileRestController.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/controller/homepage/MemberProfileRestController.java
index 43f0c37..6995be3 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/controller/homepage/MemberProfileRestController.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/controller/homepage/MemberProfileRestController.java
@@ -5,7 +5,9 @@
 import com.cooperation.project.cooperationcenter.domain.member.dto.UpdatePasswordDto;
 import com.cooperation.project.cooperationcenter.domain.member.service.MemberService;
 import com.cooperation.project.cooperationcenter.domain.member.service.ProfileService;
+import com.cooperation.project.cooperationcenter.global.exception.BaseException;
 import com.cooperation.project.cooperationcenter.global.exception.BaseResponse;
+import com.cooperation.project.cooperationcenter.global.exception.codes.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -23,17 +25,32 @@ public class MemberProfileRestController {
 
     @PatchMapping("/member")
     public BaseResponse<?> updateMemberInfo(@RequestBody Profile.MemberDto request, @AuthenticationPrincipal MemberDetails memberDetails){
-
         log.info("request:{}",request.toString());
-        profileService.updateMember(request,memberDetails);
-        return BaseResponse.onSuccess("success");
+        try{
+            profileService.updateMember(request,memberDetails);
+            return BaseResponse.onSuccess("success");
+        }catch (BaseException e){
+            log.warn(e.getCode().toString());
+            return BaseResponse.onFailure(e.getCode(),null);
+        }catch (Exception e){
+            log.warn(e.getMessage());
+            return BaseResponse.onFailure("ERROR",e.getMessage().toString(),false);
+        }
     }
 
     @PatchMapping("/agency")
     public BaseResponse<?> updateAgencyInfo(@RequestBody Profile.MemberDto request, @AuthenticationPrincipal MemberDetails memberDetails){
         log.info("request:{}",request.toString());
-        profileService.updateAgency(request,memberDetails);
-        return BaseResponse.onSuccess("success");
+        try{
+            profileService.updateAgency(request,memberDetails);
+            return BaseResponse.onSuccess("success");
+        }catch (BaseException e){
+            log.warn(e.getCode().toString());
+            return BaseResponse.onFailure(e.getCode(),null);
+        }catch (Exception e){
+            log.warn(e.getMessage());
+            return BaseResponse.onFailure("ERROR",e.getMessage().toString(),false);
+        }
     }
 
     @PatchMapping("/businessCert")
@@ -41,8 +58,16 @@ public BaseResponse<?> updateBusinessCertificate(
             @RequestPart(name = "businessCertificate", required = false) MultipartFile file
             , @AuthenticationPrincipal MemberDetails memberDetails
     ){
-        profileService.updateBussinessCert(file,memberDetails);
-        return BaseResponse.onSuccess("success");
+        try{
+            profileService.updateBussinessCert(file,memberDetails);
+            return BaseResponse.onSuccess("success");
+        }catch (BaseException e){
+            log.warn(e.getCode().toString());
+            return BaseResponse.onFailure(e.getCode(),null);
+        }catch (Exception e){
+            log.warn(e.getMessage());
+            return BaseResponse.onFailure("ERROR",e.getMessage().toString(),false);
+        }
     }
 
     @PatchMapping("/agencyPicture")
@@ -50,7 +75,15 @@ public BaseResponse<?> updateAgencyPicture(
             @RequestPart(name = "agencyPicture", required = false) MultipartFile file
             , @AuthenticationPrincipal MemberDetails memberDetails
     ){
-        profileService.updateAgencyPicture(file,memberDetails);
-        return BaseResponse.onSuccess("success");
+        try{
+            profileService.updateAgencyPicture(file,memberDetails);
+            return BaseResponse.onSuccess("success");
+        }catch (BaseException e){
+            log.warn(e.getCode().toString());
+            return BaseResponse.onFailure(e.getCode(),null);
+        }catch (Exception e){
+            log.warn(e.getMessage());
+            return BaseResponse.onFailure("ERROR",e.getMessage().toString(),false);
+        }
     }
 }
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/controller/homepage/MemberRestController.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/controller/homepage/MemberRestController.java
index d74f292..c69598a 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/controller/homepage/MemberRestController.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/controller/homepage/MemberRestController.java
@@ -4,6 +4,7 @@
 import com.cooperation.project.cooperationcenter.domain.member.dto.MemberRequest;
 import com.cooperation.project.cooperationcenter.domain.member.dto.UpdatePasswordDto;
 import com.cooperation.project.cooperationcenter.domain.member.service.MemberService;
+import com.cooperation.project.cooperationcenter.global.exception.BaseException;
 import com.cooperation.project.cooperationcenter.global.exception.BaseResponse;
 import com.cooperation.project.cooperationcenter.global.exception.codes.ErrorCode;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -36,30 +37,52 @@ public BaseResponse<?> signup(
         try{
             memberService.signup(data,agencyPicture,businessCertificate);
             return BaseResponse.onSuccess("success");
+        }catch (BaseException e){
+            return BaseResponse.onFailure(e.getCode(),null);
         }catch (Exception e){
             log.warn(e.getMessage());
-            return BaseResponse.onFailure(ErrorCode.BAD_REQUEST,null);
+            return BaseResponse.onFailure("ERROR",e.getMessage().toString(),false);
         }
     }
 
     @GetMapping("/check-id")
     public BaseResponse<?> checkDuplicateId(@RequestParam String username) {
-        boolean isDuplicate = memberService.isUsernameTaken(username);
-        log.info("response:{}",isDuplicate);
-        return BaseResponse.onSuccess(isDuplicate);
+        try{
+            return BaseResponse.onSuccess(memberService.isUsernameTaken(username));
+        }catch (BaseException e){
+            return BaseResponse.onFailure(e.getCode(),false);
+        }catch (Exception e){
+            log.warn(e.getMessage());
+            return BaseResponse.onFailure("ERROR",e.getMessage().toString(),false);
+        }
     }
 
     @PostMapping("/login")
     public BaseResponse<?> login(@RequestBody MemberRequest.LoginDto requestDto, HttpServletResponse response,HttpServletRequest request){
+        try{
             memberService.login(requestDto,response,request);
             log.info("loginSuccess");
             return BaseResponse.onSuccess("success");
+        }catch (BaseException e){
+            return BaseResponse.onFailure(e.getCode(),false);
+        }catch (Exception e){
+            log.warn(e.getMessage());
+            return BaseResponse.onFailure("ERROR",e.getMessage().toString(),false);
+        }
+
     }
 
     @PostMapping("/logout")
     public BaseResponse<?> userLogout(HttpServletRequest request ,HttpServletResponse response){
-        memberService.logout(request,response);
-        return BaseResponse.onSuccess("log out success");
+        try {
+            memberService.logout(request, response);
+            return BaseResponse.onSuccess("log out success");
+        }catch (BaseException e){
+            return BaseResponse.onFailure(e.getCode(),false);
+        }catch (Exception e){
+            log.warn(e.getMessage());
+            return BaseResponse.onFailure("ERROR",e.getMessage().toString(),false);
+        }
     }
 
     @PostMapping("/refresh")
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/MemberAdminService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/MemberAdminService.java
deleted file mode 100644
index 2a7ed32..0000000
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/MemberAdminService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-//package com.cooperation.project.cooperationcenter.domain.member.service;
-//
-//
-//import com.cooperation.project.cooperationcenter.domain.member.dto.MemberAdminStatsDto;
-//import com.cooperation.project.cooperationcenter.domain.member.model.UserStatus;
-//import com.cooperation.project.cooperationcenter.domain.member.repository.MemberRepository;
-//import lombok.RequiredArgsConstructor;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.stereotype.Service;
-//
-//import java.time.LocalDate;
-//import java.time.YearMonth;
-//
-//@Service
-//@RequiredArgsConstructor
-//@Slf4j
-//public class MemberAdminService {
-//
-////    public MemberResponse.LoginDto login(MemberRequest.LoginDto request, HttpServletResponse response) {
-////        Member member = findMemberByEmail(request.email());
-////        if(member == null) {
-////            log.warn("해당 이메일을 가진 멤버가 존재하지 않음");
-////            throw new BaseException(ErrorCode.EMAIL_NOT_FOUND);
-////        }
-////
-////        if(!member.getPassword().equals(request.password())){
-////            log.warn("로그인 실패");
-////            throw new BaseException(ErrorCode.PASSWORD_ERROR);
-////        }
-////
-////        if(!member.getRole().equals(Member.Role.ADMIN)){
-////            throw new BaseException(ErrorCode.MEMBER_NOT_ADMIN);
-////        }
-////
-////        TokenResponse tokenResponse = getTokenResponse(response,member);
-////        memberCookieService.addTokenCookies(response,tokenResponse);
-////        return MemberResponse.LoginDto.from(member);
-////    }
-////
-////    public Member findMemberByEmail(String email) {
-////        try{
-////            Member member = memberRepository.findMemberByEmail(email).orElseThrow(
-////                    () -> new BaseException(ErrorCode.MEMBER_NOT_FOUND)
-////            );
-////            return member;
-////        }catch(Exception e){
-////            return null;
-////        }
-////    }
-////
-////    public MemberResponse.LoginDto logout(HttpServletResponse response, HttpSession session, MemberDetails memberDetails, HttpServletRequest request){
-////        Member member = getMember(memberDetails.getUsername());
-////        //fixme 토큰 response가져와서 그걸 바꿔야함.
-////
-////        AccessToken accessToken = AccessToken.of(jwtProvider.resolvAccesseToken(request));
-////        RefreshToken refreshToken = RefreshToken.of(jwtProvider.resolveRefreshToken(request));
-////        log.info("refresh:{}",refreshToken.token());
-////        memberCookieService.deleteCookie(response,TokenResponse.of(accessToken,refreshToken));
-////        log.info("cookie삭제");
-////        session.invalidate();
-////        log.info("세션삭제");
-////        return MemberResponse.LoginDto.from(member);
-////    }
-////
-////    @NotNull
-////    private TokenResponse getTokenResponse(HttpServletResponse response, Member member) {
-////
-////        AccessToken accessToken = jwtProvider.generateAccessToken(member);
-////        RefreshToken refreshToken = jwtProvider.generateRefreshToken(member);
-////        TokenResponse tokenResponse = TokenResponse.of(accessToken, refreshToken);
-////        return tokenResponse;
-////    }
-////
-////    public Member getMember(String email){
-////        try {
-////            return memberRepository.findMemberByEmail(email)
-////                    .orElseThrow(() -> new BaseException(ErrorCode.MEMBER_NOT_FOUND));
-////        } catch (BaseException e){
-////            log.warn("멤버 조회 실패: {}", e.getMessage());
-////            return null;
-////        } catch (Exception e){
-////            log.error("알 수 없는 에러 발생: {}", e.getMessage(), e);
-////            return null;
-////        }
-////    }
-////
-////    @Transactional
-////    public void acceptedMember(String email){
-////        Member member = memberRepository.findMemberByEmail(email)
-////                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 이메일입니다."));
-////        member.accept();
-////        memberRepository.save(member);
-////
-////        Agency agency = Agency.fromMember(member);
-////        agencyRepository.save(agency);
-////    }
-//}
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/MemberService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/MemberService.java
index 6e987a9..7847bae 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/MemberService.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/MemberService.java
@@ -183,13 +183,8 @@ public Member getMember(String email){
     }
 
     public boolean isUsernameTaken(String username){
-        try{
             log.info("username:{}",username);
             return memberRepository.existsMemberByEmail(username);
-        }catch (Exception e){
-            log.warn(e.getMessage());
-            return false;
-        }
     }
 
     @Transactional
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/ProfileService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/ProfileService.java
index b551fdb..5755987 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/ProfileService.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/member/service/ProfileService.java
@@ -40,16 +40,8 @@ public class ProfileService {
     private final FileService fileService;
 
     public Member getMember(String email){
-        try {
-            return memberRepository.findMemberByEmail(email)
-                    .orElseThrow(() -> new BaseException(ErrorCode.MEMBER_NOT_FOUND));
-        } catch (BaseException e){
-            log.warn("멤버 조회 실패: {}", e.getMessage());
-            return null;
-        } catch (Exception e){
-            log.error("알 수 없는 에러 발생: {}", e.getMessage(), e);
-            return null;
-        }
+        return memberRepository.findMemberByEmail(email)
+                .orElseThrow(() -> new BaseException(ErrorCode.MEMBER_NOT_FOUND));
     }
 
     public Profile.ProfileDto getProfileDto(MemberDetails memberDetails, Pageable pageable){
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/school/repository/SchoolPostRepository.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/school/repository/SchoolPostRepository.java
index 57b3acc..6d7d77e 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/school/repository/SchoolPostRepository.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/school/repository/SchoolPostRepository.java
@@ -25,13 +25,17 @@ public interface SchoolPostRepository extends JpaRepository<SchoolPost,Long> {
     void incrementViewCount(@Param("postId") Long postId);
 
     @Query("""
-        SELECT p FROM SchoolPost p
-        WHERE p.schoolBoard.id = :boardId
-        ORDER BY 
-            CASE WHEN p.type = com.cooperation.project.cooperationcenter.domain.school.dto.PostType.NOTICE THEN 0 ELSE 2 END,
-            p.createdAt DESC
-    """)
-    Page<SchoolPost> findPostsByBoardOrderByNoticeFirst(@Param("boardId") Long boardId, Pageable pageable);
+    SELECT p FROM SchoolPost p
+    WHERE p.schoolBoard.id = :boardId
+      AND p.status = com.cooperation.project.cooperationcenter.domain.school.dto.PostStatus.PUBLISHED
+    ORDER BY 
+        CASE WHEN p.type = com.cooperation.project.cooperationcenter.domain.school.dto.PostType.NOTICE THEN 0 ELSE 2 END,
+        p.createdAt DESC
+""")
+    Page<SchoolPost> findPostsByBoardOrderByNoticeFirst(
+            @Param("boardId") Long boardId,
+            Pageable pageable
+    );
 
 
 }
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/controller/homepage/SurveyRestController.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/controller/homepage/SurveyRestController.java
index 4ba2c0b..4860d21 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/controller/homepage/SurveyRestController.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/controller/homepage/SurveyRestController.java
@@ -1,10 +1,8 @@
 package com.cooperation.project.cooperationcenter.domain.survey.controller.homepage;
 
 import com.cooperation.project.cooperationcenter.domain.member.dto.MemberDetails;
-import com.cooperation.project.cooperationcenter.domain.student.dto.StudentRequest;
 import com.cooperation.project.cooperationcenter.domain.survey.dto.*;
 import com.cooperation.project.cooperationcenter.domain.survey.model.Survey;
-import com.cooperation.project.cooperationcenter.domain.survey.model.SurveyFolder;
 import com.cooperation.project.cooperationcenter.domain.survey.service.homepage.*;
 import com.cooperation.project.cooperationcenter.global.exception.BaseResponse;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -13,8 +11,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.core.io.Resource;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;
@@ -22,6 +18,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
 import java.io.IOException;
 import java.util.List;
@@ -106,6 +103,13 @@ public ResponseEntity<Void> receiveSurveyAnswer(
         return ResponseEntity.ok().build();
     }
 
+    @GetMapping("/admin/answer")
+    public BaseResponse<?> getAllAnswerLog(){
+        List<AnswerResponse.LogDto> result = surveyLogService.getAllAnswerLog();
+        log.info("result : {}",result.toString());
+        return BaseResponse.onSuccess(result);
+    }
+
     @GetMapping("/admin/answer/{surveyId}")
     public BaseResponse<?> getAnswerLog(@PathVariable String surveyId){
         AnswerResponse.AnswerDto result = surveyLogService.getAnswerLog(surveyId);
@@ -114,23 +118,23 @@ public BaseResponse<?> getAnswerLog(@PathVariable String surveyId){
     }
 
     @PostMapping("/admin/log/csv")
-    public ResponseEntity<Resource> extractCsv(@RequestBody LogCsv.RequestDto request){
+    public ResponseEntity<StreamingResponseBody> extractCsv(@RequestBody LogCsv.RequestDto request){
         log.info("[enter extract csv]");
         return surveyLogService.extractCsv(request);
     }
 
     @PostMapping("/admin/log/{surveyId}")
-    public ResponseEntity<Resource> extractCsv(@PathVariable String surveyId){
+    public ResponseEntity<StreamingResponseBody> extractCsv(@PathVariable String surveyId){
         log.info("extracy all csv...");
         return surveyLogService.extractAllCsv(surveyId);
     }
 
     @PostMapping("/admin/log/file/student/{surveyId}")
-    public ResponseEntity<byte[]> extractFileStudent(@PathVariable String surveyId){
+    public ResponseEntity<StreamingResponseBody> extractFileStudent(@PathVariable String surveyId){
         return surveyLogService.extractFileStudent(surveyId);
     }
     @PostMapping("/admin/log/file/survey/{surveyId}")
-    public ResponseEntity<byte[]> extractFileSurvey(@PathVariable String surveyId){
+    public ResponseEntity<StreamingResponseBody> extractFileSurvey(@PathVariable String surveyId){
         return surveyLogService.extractFileSurvey(surveyId);
     }
 
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/dto/AnswerResponse.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/dto/AnswerResponse.java
index 183f000..bc2b30d 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/dto/AnswerResponse.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/dto/AnswerResponse.java
@@ -110,8 +110,8 @@ public record LogDto(
             String submitTime,
             Long spendTime,
             String finishStatus,
-            String logId
-
+            String logId,
+            String surveyName
     ){
         public static LogDto from(SurveyLog surveyLog){
             long diffInSeconds = Duration.between(surveyLog.getStartTime(), surveyLog.getCreatedAt()).getSeconds();
@@ -121,7 +121,8 @@ public static LogDto from(SurveyLog surveyLog){
                     surveyLog.getCreatedAt().toString(),
                     diffInSeconds,
                     "finish",
-                    surveyLog.getSurveyLogId()
+                    surveyLog.getSurveyLogId(),
+                    surveyLog.getSurvey().getSurveyTitle()
             );
         }
 
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/dto/SurveyFolderDto.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/dto/SurveyFolderDto.java
index 0415f92..5e4919b 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/dto/SurveyFolderDto.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/dto/SurveyFolderDto.java
@@ -10,6 +10,7 @@ public record SurveyFolderDto(
         String folderId,
         String displayName,
         String storedName,
+        int surveyCnt,
         LocalDateTime createdAt
 ) {
     public static SurveyFolderDto from(SurveyFolder surveyFolder) {
@@ -17,6 +18,7 @@ public static SurveyFolderDto from(SurveyFolder surveyFolder) {
                 surveyFolder.getFolderId(),
                 surveyFolder.getDisplayName(),
                 surveyFolder.getStoredName(),
+                surveyFolder.getSurveys().size(),
                 surveyFolder.getCreatedAt()
         );
     }
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/repository/SurveyLogRepository.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/repository/SurveyLogRepository.java
index 257c73e..682c321 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/repository/SurveyLogRepository.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/repository/SurveyLogRepository.java
@@ -16,4 +16,5 @@ public interface SurveyLogRepository extends JpaRepository<SurveyLog,Long> {
     SurveyLog findSurveyLogBySurveyLogId(String logId);
     Page<SurveyLog> findSurveysLogByMember(Member member, Pageable pageable);
 
+    List<SurveyLog> findTop7ByOrderByCreatedAtDesc();
 }
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyAnswerService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyAnswerService.java
index 367b370..65d42f0 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyAnswerService.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyAnswerService.java
@@ -61,7 +61,7 @@ public void answerSurvey(String data, HttpServletRequest request, MemberDetails
         }
 
         Survey survey = surveyFindService.getSurveyFromId(requestDto.surveyId());
-//        if(checkDate(survey)) throw new BaseException(ErrorCode.SURVEY_DATE_NOT_VALID);
+        if(checkDate(survey)) throw new BaseException(ErrorCode.SURVEY_DATE_NOT_VALID);
         survey.setParticipantCount();
 
         Member member = memberRepository.findMemberByEmail(memberDetails.getUsername()).get();
@@ -169,11 +169,15 @@ private FileAttachment saveFile(AnswerRequest.AnswerDto answer,MultipartHttpServ
         if (answer.answer() instanceof String str) key = answer.answer().toString();
 
         MultipartFile file = multipartRequest.getFile(key);
+        double mb = file.getSize() / 1024.0 / 1024.0;
+
         if (file == null) {
             log.warn("❌ {} 필드 없음", key);
         } else if (file.isEmpty()) {
             log.warn("❌ {} 는 비어 있음", key);
-        } else {
+        } else if(mb>20){
+            throw new BaseException(ErrorCode.FILE_SIZE_ERROR);
+        }else {
             log.info("✅ {} 수신 성공: {}", key, file.getOriginalFilename());
             //key예시 file-0 image-1
             String type = key.split("-")[0];
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyFindService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyFindService.java
index 8ec046a..4dcbf04 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyFindService.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyFindService.java
@@ -198,6 +198,15 @@ public Page<Survey> getSurveyFromCondition(Pageable pageable, SurveyRequest.LogF
         }
     }
 
+    public List<SurveyLog> findAllSurveyLog(){
+        try{
+            return surveyLogRepository.findTop7ByOrderByCreatedAtDesc();
+        }catch (Exception e){
+            log.warn(e.getMessage());
+            return null;
+        }
+    }
+
     public SurveyLog getSurveyLog(String logId){
         try{
             return surveyLogRepository.findSurveyLogBySurveyLogId(logId);
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyLogService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyLogService.java
index 2a952c4..1951086 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyLogService.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveyLogService.java
@@ -7,24 +7,22 @@
 import com.cooperation.project.cooperationcenter.domain.survey.dto.LogCsv;
 import com.cooperation.project.cooperationcenter.domain.survey.model.*;
 import com.cooperation.project.cooperationcenter.domain.survey.repository.AnswerRepository;
+import com.cooperation.project.cooperationcenter.global.exception.BaseException;
+import com.cooperation.project.cooperationcenter.global.exception.codes.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.ContentDisposition;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -51,6 +49,13 @@ public AnswerResponse.AnswerPagedDto getAnswerLog(String surveyId, Pageable page
         return AnswerResponse.AnswerPagedDto.from(survey,logs);
     }
 
+    public List<AnswerResponse.LogDto> getAllAnswerLog(){
+        List<SurveyLog> surveyLog = surveyFindService.findAllSurveyLog();
+        return AnswerResponse.LogDto.from(surveyLog);
+
+    }
+
+
     public AnswerResponse.AnswerDto getAnswerLog(String surveyId){
         Survey survey = surveyFindService.getSurveyFromId(surveyId);
         List<SurveyLog> surveyLog = surveyFindService.getSurveyLogs(survey);
@@ -75,233 +80,255 @@ public AnswerResponse.AnswerLogDto getAnswerLogDetail(String logId){
         return AnswerResponse.AnswerLogDto.from(survey,surveyLog,answers);
     }
 
-    public ResponseEntity<Resource> extractCsv(LogCsv.RequestDto request){
-        StringBuilder csvBuilder = new StringBuilder();
-        final String UTF8_BOM = "\uFEFF";  // ← 이게 핵심!
-        csvBuilder.append(UTF8_BOM);
+    public ResponseEntity<StreamingResponseBody> extractCsv(LogCsv.RequestDto request){
+        var logs = surveyFindService.getSurveyLogs(request.logIds());
+        if (logs == null || logs.isEmpty()) throw new BaseException(ErrorCode.BAD_REQUEST);
 
-        List<SurveyLog> logs = surveyFindService.getSurveyLogs(request.logIds());
-        if(logs == null){
-            //fixme 확인해야함.
-            log.warn("log is null");
-        }
-        Survey survey = Objects.requireNonNull(logs).get(0).getSurvey();
+        Survey survey = logs.get(0).getSurvey();
         List<Question> questions = surveyFindService.getQuestions(survey);
 
-        List<String> questionTexts = questions.stream()
-                .map(q -> toCsvSafe(q.getQuestion()))
-                .toList();
-        String questionLine = "no,"+String.join(",", questionTexts);
-        questionLine+="\n";
-        System.out.println(questionLine);
-        csvBuilder.append(questionLine);
-
-        int i=1;
-        for(SurveyLog log : logs){
-            List<Answer> answers = surveyFindService.getAnswer(log);
-
-            Map<Integer, Answer> answerMap = new TreeMap<>();
-            for (Answer answer : answers) {
-                answerMap.put(answer.getQuestionId(), answer);
-            }
+        StreamingResponseBody body = out -> {
+            // Excel UTF-8 BOM
+            out.write("\uFEFF".getBytes(StandardCharsets.UTF_8));
+            var writer = new java.io.BufferedWriter(new java.io.OutputStreamWriter(out, StandardCharsets.UTF_8));
+
+            // 헤더: questionOrder 기준(escape)
+            writer.write("no,");
+            writer.write(questions.stream().map(q -> toCsvSafe(q.getQuestion())).collect(Collectors.joining(",")));
+            writer.write("\n");
 
-            int maxQuestionId = questions.size();
-
-            List<String> answerTexts = new ArrayList<>(maxQuestionId);
-            for (int j = 1; j <= maxQuestionId; j++) {
-                Answer a = answerMap.get(j);
-                if (a == null) {
-                    answerTexts.add(""); // 빈 칸 처리
-                } else if (QuestionType.isFile(a.getAnswerType())) {
-                    answerTexts.add("\"=HYPERLINK(\"\"" + origin + a.getAnswer().split("_")[0] + "\"\")\"");
-                } else if (QuestionType.checkType(a.getAnswerType())) {
-                    answerTexts.add(toCsvSafe(surveyFindService.getAnswerFromMultiple(a)));
-                } else {
-                    answerTexts.add(a.getAnswer());
+            int row = 1;
+            for (SurveyLog log : logs) {
+                // N+1 방지: findService에서 answers를 fetch join으로 가져오게 하거나 여기서 배치 조회
+                List<Answer> answers = surveyFindService.getAnswer(log);
+
+                // questionId -> Answer 매핑
+                Map<String, Answer> byQid = answers.stream()
+                        .collect(Collectors.toMap(Answer::getQuestionRealId, a -> a, (a,b)->a));
+
+                List<String> cells = new ArrayList<>(questions.size()+1);
+                cells.add(String.valueOf(row++));
+
+                // “질문 리스트 순서(questionOrder)”대로 셀 채우기 (size로 1..N 도는 방식 지양)
+                for (Question q : questions) {
+                    Answer a = byQid.get(q.getQuestionId());
+                    if (a == null) { cells.add(""); continue; }
+
+                    if (QuestionType.isFile(a.getAnswerType())) {
+                        String id = a.getAnswer().split("_")[0]; // TODO: 안전한 파싱으로 교체 권장
+                        // 하이퍼링크 수식 주입 시에도 CSV 인젝션 보호 필요
+                        cells.add("\"=HYPERLINK(\"\"" + origin + a.getAnswer().split("_")[0] + "\"\")\"");
+                    } else if (QuestionType.checkType(a.getAnswerType())) {
+                        cells.add(toCsvSafe(surveyFindService.getAnswerFromMultiple(a)));
+                    } else {
+                        cells.add(toCsvSafe(a.getAnswer()));
+                    }
                 }
+                writer.write(String.join(",", cells));
+                writer.write("\n");
+                writer.flush(); // 청크 단위로 흘려보내기
             }
-            String AnswerLine = (i++)+","+String.join(",", answerTexts);
-            AnswerLine+="\n";
-            System.out.println(AnswerLine);
-            csvBuilder.append(AnswerLine);
-        }
-
-        byte[] csvBytes = csvBuilder.toString().getBytes(StandardCharsets.UTF_8);
-        ByteArrayResource resource = new ByteArrayResource(csvBytes);
+            writer.flush();
+        };
 
-        // 2. 헤더 설정 및 응답
         return ResponseEntity.ok()
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=survey-logs.csv")
-                .contentType(MediaType.parseMediaType("text/csv"))
-                .contentLength(csvBytes.length)
-                .body(resource);
+                .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition("survey-logs.csv"))
+                .contentType(MediaType.parseMediaType("text/csv; charset=UTF-8"))
+                .body(body);
     }
 
-    public ResponseEntity<Resource> extractAllCsv(String surveyId){
-        StringBuilder csvBuilder = new StringBuilder();
-        final String UTF8_BOM = "\uFEFF";  // ← 이게 핵심!
-        csvBuilder.append(UTF8_BOM);
 
-        Survey survey = surveyFindService.getSurveyFromId(surveyId);
-        List<SurveyLog> logs = surveyFindService.getSurveyLogs(survey);
+    private static String contentDisposition(String filename) {
+        // RFC 5987 방식 + 기본 filename 함께 제공
+        String encoded = URLEncoder.encode(filename, StandardCharsets.UTF_8)
+                .replaceAll("\\+", "%20");
+        return "attachment; filename=\"" + filename + "\"; filename*=UTF-8''" + encoded;
+    }
 
-        if(logs == null){
-            //fixme 확인해야함.
-            log.warn("log is null");
+    public ResponseEntity<StreamingResponseBody> extractAllCsv(String surveyId){
+        final String fileBaseUrl = origin; // 기존 origin 사용
+        final Survey survey = surveyFindService.getSurveyFromId(surveyId);
+        final List<SurveyLog> logs = surveyFindService.getSurveyLogs(survey);
+        if (logs == null || logs.isEmpty()) {
+            throw new BaseException(ErrorCode.BAD_REQUEST);
         }
-        List<Question> questions = surveyFindService.getQuestions(survey);
+        final List<Question> questions = surveyFindService.getQuestions(survey);
+
+        StreamingResponseBody body = out -> {
+            // 엑셀 호환 BOM
+            out.write("\uFEFF".getBytes(StandardCharsets.UTF_8));
+
+            try (BufferedWriter writer =
+                         new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) {
+
+                // 1) 헤더 (질문 순서대로)
+                String header = "no," + questions.stream()
+                        .map(q -> toCsvSafe(q.getQuestion()))
+                        .collect(Collectors.joining(","));
+                writer.write(header);
+                writer.write("\n");
+                writer.flush();
+
+                // 2) 본문
+                int row = 1;
+                for (SurveyLog log : logs) {
+                    // N+1이면 surveyFindService.getAnswer(log) 쪽 fetch join/일괄조회 최적화 권장
+                    List<Answer> answers = surveyFindService.getAnswer(log);
+
+                    // 질문ID(real) -> 답변 맵 (※ Answer에 getQuestionRealId가 없으면 getQuestionId로 대체)
+                    Map<String, Answer> byQid = new HashMap<>();
+                    for (Answer a : answers) {
+                        String key = a.getQuestionRealId(); // 없으면 a.getQuestionId()
+                        byQid.put(key, a);
+                    }
 
-        List<String> questionTexts = questions.stream()
-                .map(q -> toCsvSafe(q.getQuestion()))
-                .toList();
-        String questionLine = "no,"+String.join(",", questionTexts);
-        questionLine+="\n";
-        System.out.println(questionLine);
-        csvBuilder.append(questionLine);
-
-        int i=1;
-        for(SurveyLog log : logs){
-            List<Answer> answers = surveyFindService.getAnswer(log);
-
-            Map<Integer, Answer> answerMap = new TreeMap<>();
-            for (Answer answer : answers) {
-                answerMap.put(answer.getQuestionId(), answer);
-            }
+                    List<String> cells = new ArrayList<>(questions.size() + 1);
+                    cells.add(String.valueOf(row++));
+
+                    // 질문 리스트 순서(questionOrder)대로 채우기
+                    for (Question q : questions) {
+                        Answer a = byQid.get(q.getQuestionId());
+                        if (a == null) {
+                            cells.add("");
+                            continue;
+                        }
+
+                        if (QuestionType.isFile(a.getAnswerType())) {
+                            // 파일 셀은 의도적으로 HYPERLINK 수식 사용
+                            String fileKey = safeFirstToken(a.getAnswer()); // "id_rest" 형태 보호
+                            cells.add("\"=HYPERLINK(\"\"" + fileBaseUrl + fileKey + "\"\")\"");
+                        } else if (QuestionType.checkType(a.getAnswerType())) {
+                            cells.add(toCsvSafe(surveyFindService.getAnswerFromMultiple(a)));
+                        } else {
+                            // 일반 텍스트는 CSV 인젝션 방지 + CSV escape
+                            cells.add(toCsvSafe(preventCsvInjection(a.getAnswer())));
+                        }
+                    }
 
-            int maxQuestionId = questions.size();
-
-            List<String> answerTexts = new ArrayList<>(maxQuestionId);
-            for (int j = 1; j <= maxQuestionId; j++) {
-                Answer a = answerMap.get(j);
-                if (a == null) {
-                    answerTexts.add(""); // 빈 칸 처리
-                } else if (QuestionType.isFile(a.getAnswerType())) {
-                    answerTexts.add("\"=HYPERLINK(\"\"" + origin + a.getAnswer().split("_")[0] + "\"\")\"");
-                } else if (QuestionType.checkType(a.getAnswerType())) {
-                    answerTexts.add(toCsvSafe(surveyFindService.getAnswerFromMultiple(a)));
-                } else {
-                    answerTexts.add(a.getAnswer());
+                    writer.write(String.join(",", cells));
+                    writer.write("\n");
+                    writer.flush(); // 청크로 바로바로 전송
                 }
+                writer.flush();
             }
-            String AnswerLine = (i++)+","+String.join(",", answerTexts);
-            AnswerLine+="\n";
-            System.out.println(AnswerLine);
-            csvBuilder.append(AnswerLine);
-        }
+        };
 
-        byte[] csvBytes = csvBuilder.toString().getBytes(StandardCharsets.UTF_8);
-        ByteArrayResource resource = new ByteArrayResource(csvBytes);
+        ContentDisposition cd = ContentDisposition.attachment()
+                .filename("survey-logs.csv", StandardCharsets.UTF_8)
+                .build();
 
-        // 2. 헤더 설정 및 응답
         return ResponseEntity.ok()
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=survey-logs.csv")
-                .contentType(MediaType.parseMediaType("text/csv"))
-                .contentLength(csvBytes.length)
-                .body(resource);
+                .header(HttpHeaders.CONTENT_DISPOSITION, cd.toString())
+                .contentType(MediaType.parseMediaType("text/csv; charset=UTF-8"))
+                .body(body);
     }
 
-    public ResponseEntity<byte[]> extractFileStudent(String surveyId){
-        log.info("학생 폴더 출력 start...");
-        Survey survey = surveyFindService.getSurveyFromId(surveyId);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (ZipOutputStream zos = new ZipOutputStream(baos)) {
-            List<SurveyLog> logs = surveyFindService.getSurveyLogs(survey);
-            int logIndex = 1;
-            for (SurveyLog log : logs) {
-                String memberName = log.getMember().getMemberName();
-                String logFolder = logIndex + "_" + memberName + "/";
-
-                List<Answer> answers = log.getAnswers();
-
-                for (Answer answer : answers) {
-                    System.out.println("teset: "+answer.getAnswerType());
-                    if(!(answer.getAnswerType().equals(QuestionType.FILE)||answer.getAnswerType().equals(QuestionType.IMAGE))) continue;
-
-                    FileAttachment file = answer.getSurveyFile();
-                    System.out.println("filename:"+file.getStoredName());
-
-                    if(!ossService.isFileExist(file)){
-                        System.out.println("해당 파일 없음");
-                        continue;
-                    }
+    private static String preventCsvInjection(String s) {
+        if (s == null || s.isEmpty()) return "";
+        char c = s.charAt(0);
+        if (c == '=' || c == '+' || c == '-' || c == '@' || c == '\t') {
+            return "'" + s;
+        }
+        return s;
+    }
 
+    private static String safeFirstToken(String v) {
+        if (v == null || v.isBlank()) return "";
+        int idx = v.indexOf('_');
+        String token = (idx >= 0) ? v.substring(0, idx) : v;
+        return token.replaceAll("[\\r\\n\\t\\x00-\\x1F\\x7F]", "");
+    }
 
-                    String fileName = "Q" + answer.getQuestionId() + "_" + file.getOriginalName();
-                    String zipEntryName = logFolder + fileName;
-                    zos.putNextEntry(new ZipEntry(zipEntryName));
+    public ResponseEntity<StreamingResponseBody> extractFileStudent(String surveyId){
+        log.info("학생 폴더 출력 start...");
+        Survey survey = surveyFindService.getSurveyFromId(surveyId);
+        List<SurveyLog> logs = surveyFindService.getSurveyLogs(survey);
 
-                    try (OSSObject ossObject = ossService.getObject(file);
-                         InputStream inputStream = ossObject.getObjectContent()) {
-                        inputStream.transferTo(zos);
+        StreamingResponseBody body = out -> {
+            try (ZipOutputStream zos = new ZipOutputStream(out)) {
+                int idx = 1;
+                for (SurveyLog log : logs) {
+                    String memberName = log.getMember() != null ? log.getMember().getMemberName() : "unknown";
+                    String folder = idx++ + "_" + memberName + "/";
+
+                    // N+1 주의: answers를 fetch join으로 미리 가져오게
+                    for (Answer a : surveyFindService.getAnswer(log)) {
+                        if (!(a.getAnswerType() == QuestionType.FILE || a.getAnswerType() == QuestionType.IMAGE)) continue;
+
+                        FileAttachment f = a.getSurveyFile();
+                        if (f == null) continue;
+
+                        if (!ossService.isFileExist(f)) {
+                            System.out.println("file missing: "+f.getStoredName());
+                            continue; }
+
+                        String entryName = folder + "Q" + a.getQuestionId() + "_" + f.getOriginalName();
+                        zos.putNextEntry(new ZipEntry(entryName));
+                        try (var obj = ossService.getObject(f); InputStream in = obj.getObjectContent()) {
+                            in.transferTo(zos);
+                        }
+                        zos.closeEntry();
                     }
-                    zos.closeEntry();
                 }
-                logIndex++;
+                zos.finish();
             }
-            zos.finish();
-
-        } catch (IOException e) {
-            log.warn(e.getMessage());
-            throw new RuntimeException(e);
-        }
-
-        byte[] zipBytes = baos.toByteArray();
-        log.info("zip 생성 완료");
+        };
 
         return ResponseEntity.ok()
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + surveyId + "_logs.zip\"")
+                .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition(surveyId + "_logs.zip"))
                 .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                .contentLength(zipBytes.length)
-                .body(zipBytes);
+                .body(body);
     }
 
-    public ResponseEntity<byte[]> extractFileSurvey(String surveyId){
+    public ResponseEntity<StreamingResponseBody> extractFileSurvey(String surveyId){
         log.info("설문조사 폴더 출력 start...");
-        Survey survey =surveyFindService.getSurveyFromId(surveyId);;
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (ZipOutputStream zos = new ZipOutputStream(baos)) {
-
-            List<Question> questions = survey.getQuestions();
-
-            for (Question question : questions) {
-                if(!(question.getQuestionType().equals(QuestionType.FILE)||question.getQuestionType().equals(QuestionType.IMAGE))) continue;
-                List<Answer> answers = answerRepository.findAnswerByQuestionRealId(question.getQuestionId());
-                List<FileAttachment> files = answers.stream().map(Answer::getSurveyFile).toList();
-
-                int index = 1;
-                for (FileAttachment file : files) {
-
-                    if(!ossService.isFileExist(file)){
-                        System.out.println("해당 파일 없음");
-                        continue;
-                    }
+        Survey survey = surveyFindService.getSurveyFromId(surveyId);
 
-                    String zipEntryName = "Q" + question.getQuestionOrder() + "/" + index + "_" + file.getOriginalName();
-                    zos.putNextEntry(new ZipEntry(zipEntryName));
+        // 미리 필요한 질문만 필터
+        List<Question> questions = survey.getQuestions().stream()
+                .filter(q -> q.getQuestionType() == QuestionType.FILE || q.getQuestionType() == QuestionType.IMAGE)
+                .toList();
 
-                    try (OSSObject ossObject = ossService.getObject(file);
-                         InputStream inputStream = ossObject.getObjectContent()) {
-                        inputStream.transferTo(zos);
+        StreamingResponseBody body = out -> {
+            try (ZipOutputStream zos = new ZipOutputStream(out)) {
+                for (Question question : questions) {
+                    // ⚠️ N+1이면 여기서 answers 일괄조회/페치조인으로 최적화 권장
+                    List<Answer> answers = answerRepository.findAnswerByQuestionRealId(question.getQuestionId());
+
+                    int idx = 1;
+                    for (Answer a : answers) {
+                        FileAttachment file = a.getSurveyFile();
+                        if (file == null) continue;
+
+                        // (선택) 존재 확인 호출이 비싸면 getObject 404로 분기하거나 스킵
+                        if (!ossService.isFileExist(file)) {
+                            log.debug("file missing: {}", file.getStoredName());
+                            continue;
+                        }
+
+                        String entryName = "Q" + question.getQuestionOrder() + "/"
+                                + idx++ + "_" + file.getOriginalName();
+
+                        zos.putNextEntry(new ZipEntry(entryName));
+                        try (OSSObject obj = ossService.getObject(file);
+                             InputStream in = obj.getObjectContent()) {
+                            in.transferTo(zos);
+                        }
+                        zos.closeEntry();
                     }
-
-                    zos.closeEntry();
-                    index++;
                 }
+                zos.finish();
             }
-            zos.finish(); // 명시적 종료
-        } catch (IOException e) {
-            log.warn(e.getMessage());
-            throw new RuntimeException(e);
-        }
+        };
 
-        byte[] zipBytes = baos.toByteArray();
-        log.info("zip 생성 완료");
+        ContentDisposition cd = ContentDisposition.attachment()
+                .filename(surveyId + ".zip", StandardCharsets.UTF_8)
+                .build();
 
         return ResponseEntity.ok()
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + surveyId + ".zip\"")
+                .header(HttpHeaders.CONTENT_DISPOSITION, cd.toString())
                 .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                .contentLength(zipBytes.length)
-                .body(zipBytes);
+                .body(body);
     }
 
 
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveySaveService.java b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveySaveService.java
index 0ed13f2..e24d857 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveySaveService.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/domain/survey/service/homepage/SurveySaveService.java
@@ -89,15 +89,10 @@ public void deleteRemovedQuestions(Survey survey, List<Question> questions){
 
     @Transactional
     public void save(Survey survey, List<Question> questions, List<QuestionOption> options){
-        try {
             surveyRepository.save(survey);
             questionRepository.saveAll(questions);
             questionOptionRepository.saveAll(options);
             log.info("설문조사 저장 완료");
-        }catch (Exception e){
-            log.warn(e.getMessage());
-            log.warn("설문조사 저장 실패");
-        }
     }
 //HtmlUtils.htmlEscape(question);
     public List<Question> getQuestionsFromDto(List<QuestionDto> request, Survey survey){
@@ -114,7 +109,6 @@ public List<Question> getQuestionsFromDto(List<QuestionDto> request, Survey surv
                     question.setQuestionType(questionType);
                     question.setOption(QuestionType.checkType(questionType));
                     question.setQuestionOrder(i++);
-                    question.setTemplate(dto.isTemplate());
                     question.setDomainField(dto.domainField());
                     question.setTemplate(dto.isTemplate());
                     questions.add(question);
@@ -195,7 +189,10 @@ public AnswerPageDto getSurveys(String surveyId){
         List<QuestionDto> response = new ArrayList<>();
         Survey survey = surveyFindService.getSurveyFromId(surveyId);
 
-        if(!survey.isShare()) return null;
+        boolean expired = (survey.getEndDate() != null) && LocalDate.now().isAfter(survey.getEndDate());  // today > endDate
+
+        if(!survey.isShare()) throw new BaseException(ErrorCode.SURVEY_NOT_SHARE);
+        if(expired) throw new BaseException(ErrorCode.SURVEY_DATE_NOT_VALID);
 
         List<Question> questions = surveyFindService.getQuestions(survey);
         List<QuestionOption> options = surveyFindService.getOptions(survey);
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/global/config/SecurityConfig.java b/src/main/java/com/cooperation/project/cooperationcenter/global/config/SecurityConfig.java
index 2c68b86..d3e3f3f 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/global/config/SecurityConfig.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/global/config/SecurityConfig.java
@@ -45,8 +45,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{
 
                                 //note static 해제
                                 .requestMatchers("/css/**","/plugins/**","/js/**").permitAll()
-
                                 //fixme 임시용임 밑에는
+                                .requestMatchers("/v3/**",
+                                        "/swagger-ui.html",
+                                        "/swagger-ui/**",
+                                        "/swagger-resources/**",
+                                        "/api-test/**").permitAll()
 //                                .requestMatchers("/api/v1/**").permitAll()
 //                                .requestMatchers("/**").permitAll()
                                 //note 일반 사용자 페이지
@@ -61,7 +65,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{
                                 //note 로그인한 사용자
                                 .requestMatchers("/survey/log/detail/**").authenticated()
 
-
                                 //note admin 페이지
                                 .requestMatchers("/admin/login").permitAll()
                                 .requestMatchers("/admin/**").hasRole("ADMIN")
@@ -100,6 +103,7 @@ public CorsConfigurationSource corsConfigurationSource() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
 
         configuration.addAllowedOriginPattern("http://172.30.1.70:8081");
+        configuration.addAllowedOriginPattern("http://localhost:8081");
         configuration.addAllowedOriginPattern("https://11680c706486.ngrok-free.app");
         configuration.addAllowedHeader("*");
         configuration.addAllowedMethod("*");
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/global/config/SwaggerConfig.java b/src/main/java/com/cooperation/project/cooperationcenter/global/config/SwaggerConfig.java
new file mode 100644
index 0000000..d37c26b
--- /dev/null
+++ b/src/main/java/com/cooperation/project/cooperationcenter/global/config/SwaggerConfig.java
@@ -0,0 +1,22 @@
+package com.cooperation.project.cooperationcenter.global.config;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import org.springframework.context.annotation.Bean;
+
+public class SwaggerConfig {
+    @Bean
+    public OpenAPI openAPI() {
+        return new OpenAPI()
+                .components(new Components())
+                .info(apiInfo());
+    }
+
+    private Info apiInfo() {
+        return new Info()
+                .title("CooperationCenter") // API의 제목
+                .description("유학원 홍보 웹사이트") // API에 대한 설명
+                .version("1.0.0"); // API의 버전
+    }
+}
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/global/exception/codes/ErrorCode.java b/src/main/java/com/cooperation/project/cooperationcenter/global/exception/codes/ErrorCode.java
index e20f298..e51477a 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/global/exception/codes/ErrorCode.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/global/exception/codes/ErrorCode.java
@@ -69,11 +69,11 @@ public enum ErrorCode implements BaseCode {
     //바인딩 에러
     BINDING_ERROR(HttpStatus.BAD_REQUEST, "BINDING-0000", "바인딩에 실패했습니다."),
 
-    FILE_EXTENSION_ERROR(HttpStatus.BAD_REQUEST, "File-0000", "파일 확장자가 잘못되었습니다."),
-    FILE_READ_ERROR(HttpStatus.BAD_REQUEST, "File-0001", "파일을 읽어오는데 실패하였습니다."),
-    FILE_NOT_FOUND(HttpStatus.BAD_REQUEST, "File-0002", "해당 ID를 가진 파일을 찾을 수 없습니다."),
-    FILELOG_NOT_FOUND(HttpStatus.BAD_REQUEST, "File-0003", "파일 업로드 기록을 가져올 수 없습니다."),
-    FILE_SIZE_ERROR(HttpStatus.BAD_REQUEST, "File-0004", "파일 사이즈가 너무 큽니다."),
+    FILE_EXTENSION_ERROR(HttpStatus.BAD_REQUEST, "FILE-0000", "파일 확장자가 잘못되었습니다."),
+    FILE_READ_ERROR(HttpStatus.BAD_REQUEST, "FILE-0001", "파일을 읽어오는데 실패하였습니다."),
+    FILE_NOT_FOUND(HttpStatus.BAD_REQUEST, "FILE-0002", "해당 ID를 가진 파일을 찾을 수 없습니다."),
+    FILELOG_NOT_FOUND(HttpStatus.BAD_REQUEST, "FILE-0003", "파일 업로드 기록을 가져올 수 없습니다."),
+    FILE_SIZE_ERROR(HttpStatus.BAD_REQUEST, "FILE-0004", "파일 사이즈가 너무 큽니다."),
 
     //로그인 에러
     EMAIL_NOT_FOUND(HttpStatus.NOT_FOUND, "LOGIN-0000", "이메일이 잘못됨"),
@@ -95,6 +95,7 @@ public enum ErrorCode implements BaseCode {
     MEMBER_NOT_ADMIN(HttpStatus.BAD_REQUEST,"MEMBER-0004","Meber is not ADMIN"),
 
     SURVEY_DATE_NOT_VALID(HttpStatus.BAD_REQUEST,"SURVEY-0000","지금 설문조사 입력 기간이 아닙니다."),
+    SURVEY_NOT_SHARE(HttpStatus.BAD_REQUEST,"SURVEY-0001","해당 설문조사는 공개 전입니다."),
 
     // 5xx : server error
     INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "SERVER-0000", "서버 에러");
diff --git a/src/main/java/com/cooperation/project/cooperationcenter/global/filter/AuthenticationTokenFilter.java b/src/main/java/com/cooperation/project/cooperationcenter/global/filter/AuthenticationTokenFilter.java
index 21bffa9..e6c1a99 100644
--- a/src/main/java/com/cooperation/project/cooperationcenter/global/filter/AuthenticationTokenFilter.java
+++ b/src/main/java/com/cooperation/project/cooperationcenter/global/filter/AuthenticationTokenFilter.java
@@ -36,6 +36,16 @@ protected void doFilterInternal(HttpServletRequest request,
         String path = request.getServletPath();
         log.info("진입 path:{}",path);
 
+        if ("/v3/api-docs".equals(path) ||
+                path.startsWith("/v3/api-docs/") ||
+                path.equals("/swagger-ui.html") ||
+                path.startsWith("/swagger-ui/") ||
+                path.startsWith("/swagger-resources/") ||
+                path.startsWith("/api-test/")) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
         //note 무시하는 endpoint들
         final String[] IGNORE_PATHS = {
                 "/css", "/js", "/plugins","/member/logout","/member/signup","/api/v1/member","/api/v1/admin","/api/v1/file/img","/admin/login","/favicon.ico","/api/v1/tencent"
@@ -74,26 +84,11 @@ protected void doFilterInternal(HttpServletRequest request,
             } catch (ExpiredJwtException e) {
                 log.warn(e.getMessage());
                 log.warn("authentication에서 오류발생");
+                response.sendRedirect("/member/login");
                 request.setAttribute("tokenExpired", true); // 포워드 시 전달용
             }
         }
         SecurityContextHolder.clearContext();
         filterChain.doFilter(request, response);
     }
-
-
-    private void sendErrorResponse(HttpServletResponse response, ErrorCode errorCode) throws IOException {
-        // 1) HTTP 상태 및 인코딩/타입 설정
-        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-        response.setContentType("application/json; charset=UTF-8");
-        response.setCharacterEncoding("UTF-8");
-
-        // 2) BaseResponse 형식으로 에러 객체 생성
-        BaseResponse<Object> errorBody = BaseResponse.onFailure(errorCode.getCode(), errorCode.getMessage(), null);
-
-        // 3) JSON 직렬화 후 쓰기
-        ObjectMapper objectMapper = new ObjectMapper();
-        String json = objectMapper.writeValueAsString(errorBody);
-        response.getWriter().write(json);
-    }
 }
diff --git a/src/main/resources/static/js/homepage/login.js b/src/main/resources/static/js/homepage/common/login.js
similarity index 97%
rename from src/main/resources/static/js/homepage/login.js
rename to src/main/resources/static/js/homepage/common/login.js
index 7ee3b20..87ff941 100644
--- a/src/main/resources/static/js/homepage/login.js
+++ b/src/main/resources/static/js/homepage/common/login.js
@@ -1,72 +1,72 @@
-async function loadPageContent() {
-    const response = await fetch(window.location.pathname, {
-        credentials: 'include'
-    });
-
-    const contentType = response.headers.get('Content-Type');
-
-    if (contentType && contentType.includes('application/json')) {
-        const result = await response.json();
-
-        if (result.code === 'TOKEN-0000') {
-            const shouldRefresh = confirm("세션이 만료되었습니다. 연장하시겠습니까?");
-            if (shouldRefresh) {
-                const refreshRes = await fetch('/api/v1/member/refresh', {
-                    method: 'POST',
-                    credentials: 'include'
-                });
-                const refreshJson = await refreshRes.json();
-                if (refreshJson.isSuccess) {
-                    location.reload(); // 새로고침 (토큰 갱신 후)
-                } else {
-                    alert("다시 로그인해주세요.");
-                    window.location.href = "/member/login";
-                }
-            } else {
-                window.location.href = "/member/login";
-            }
-            return;
-        }
-    }
-
-    // JSON 아니면 일반 HTML로 간주 → 그대로 렌더링
-    const html = await response.text();
-    document.open();
-    document.write(html);
-    document.close();
-}
-
-const webLoginBtn = document.getElementById("web-login-button");
-const mobileLoginBtn = document.getElementById("mobile-login-button");
-if (webLoginBtn) setupLoginLogoutHandler(webLoginBtn);
-if (mobileLoginBtn) setupLoginLogoutHandler(mobileLoginBtn);
-
-function setupLoginLogoutHandler(btn) {
-    if (!btn) return;
-
-    btn.addEventListener("click", () => {
-        const label = btn.textContent.trim();
-
-        if (label === "로그인") {
-            window.location.href = "/member/login";
-        } else if(label === "로그아웃") {
-            console.log("로그아웃 버튼 클릭");
-            fetch("/api/v1/member/logout", {
-                method: "POST",
-                credentials: "include"
-            }).then(response => {
-                if (response.ok) {
-                    window.location.href = "/home";
-                } else {
-                    alert("로그아웃 실패");
-                }
-            }).catch(err => {
-                console.error("로그아웃 오류:", err);
-                alert("오류 발생");
-            });
-        }else {
-            window.location.href = "/profile";
-
-        }
-    });
-}
+async function loadPageContent() {
+    const response = await fetch(window.location.pathname, {
+        credentials: 'include'
+    });
+
+    const contentType = response.headers.get('Content-Type');
+
+    if (contentType && contentType.includes('application/json')) {
+        const result = await response.json();
+
+        if (result.code === 'TOKEN-0000') {
+            const shouldRefresh = confirm("세션이 만료되었습니다. 연장하시겠습니까?");
+            if (shouldRefresh) {
+                const refreshRes = await fetch('/api/v1/member/refresh', {
+                    method: 'POST',
+                    credentials: 'include'
+                });
+                const refreshJson = await refreshRes.json();
+                if (refreshJson.isSuccess) {
+                    location.reload(); // 새로고침 (토큰 갱신 후)
+                } else {
+                    alert("다시 로그인해주세요.");
+                    window.location.href = "/member/login";
+                }
+            } else {
+                window.location.href = "/member/login";
+            }
+            return;
+        }
+    }
+
+    // JSON 아니면 일반 HTML로 간주 → 그대로 렌더링
+    const html = await response.text();
+    document.open();
+    document.write(html);
+    document.close();
+}
+
+const webLoginBtn = document.getElementById("web-login-button");
+const mobileLoginBtn = document.getElementById("mobile-login-button");
+if (webLoginBtn) setupLoginLogoutHandler(webLoginBtn);
+if (mobileLoginBtn) setupLoginLogoutHandler(mobileLoginBtn);
+
+function setupLoginLogoutHandler(btn) {
+    if (!btn) return;
+
+    btn.addEventListener("click", () => {
+        const label = btn.textContent.trim();
+
+        if (label === "로그인") {
+            window.location.href = "/member/login";
+        } else if(label === "로그아웃") {
+            console.log("로그아웃 버튼 클릭");
+            fetch("/api/v1/member/logout", {
+                method: "POST",
+                credentials: "include"
+            }).then(response => {
+                if (response.ok) {
+                    window.location.href = "/home";
+                } else {
+                    alert("로그아웃 실패");
+                }
+            }).catch(err => {
+                console.error("로그아웃 오류:", err);
+                alert("오류 발생");
+            });
+        }else {
+            window.location.href = "/profile";
+
+        }
+    });
+}
diff --git a/src/main/resources/static/js/homepage/nav-user-mobile.js b/src/main/resources/static/js/homepage/common/nav-user-mobile.js
similarity index 100%
rename from src/main/resources/static/js/homepage/nav-user-mobile.js
rename to src/main/resources/static/js/homepage/common/nav-user-mobile.js
diff --git a/src/main/resources/static/js/homepage/nav-user.js b/src/main/resources/static/js/homepage/common/nav-user.js
similarity index 97%
rename from src/main/resources/static/js/homepage/nav-user.js
rename to src/main/resources/static/js/homepage/common/nav-user.js
index 2dd8a13..345652e 100644
--- a/src/main/resources/static/js/homepage/nav-user.js
+++ b/src/main/resources/static/js/homepage/common/nav-user.js
@@ -1,41 +1,41 @@
-document.addEventListener("DOMContentLoaded", () => {
-    const mobileBtn = document.getElementById("mobile-menu-button");
-    const mobileMenu = document.getElementById("mobile-menu");
-    const mobileUniBtn = document.getElementById("mobile-university-button");
-    const mobileUniMenu = document.getElementById("mobile-university-menu");
-    const uniBtn = document.getElementById("university-button");
-    const uniMenu = document.getElementById("university-menu");
-
-    // 모바일 전체 메뉴 토글
-    if (mobileBtn && mobileMenu) {
-        mobileBtn.addEventListener("click", (e) => {
-            e.stopPropagation();
-            mobileMenu.classList.toggle("hidden");
-            console.log(mobileMenu);
-        });
-    }
-
-    // 모바일 대학교 하위 메뉴 토글
-    if (mobileUniBtn && mobileUniMenu) {
-        mobileUniBtn.addEventListener("click", (e) => {
-            console.log("univ menu btn click");
-            e.stopPropagation();
-            mobileUniMenu.classList.toggle("hidden");
-            mobileUniBtn.querySelector("i").classList.toggle("rotate-180");
-        });
-    }
-
-    // 데스크탑 대학교 메뉴 토글
-    if (uniBtn && uniMenu) {
-        uniBtn.addEventListener("click", (e) => {
-            e.stopPropagation();
-            uniMenu.classList.toggle("hidden");
-        });
-
-        document.addEventListener("click", (e) => {
-            if (!uniBtn.contains(e.target) && !uniMenu.contains(e.target)) {
-                uniMenu.classList.add("hidden");
-            }
-        });
-    }
+document.addEventListener("DOMContentLoaded", () => {
+    const mobileBtn = document.getElementById("mobile-menu-button");
+    const mobileMenu = document.getElementById("mobile-menu");
+    const mobileUniBtn = document.getElementById("mobile-university-button");
+    const mobileUniMenu = document.getElementById("mobile-university-menu");
+    const uniBtn = document.getElementById("university-button");
+    const uniMenu = document.getElementById("university-menu");
+
+    // 모바일 전체 메뉴 토글
+    if (mobileBtn && mobileMenu) {
+        mobileBtn.addEventListener("click", (e) => {
+            e.stopPropagation();
+            mobileMenu.classList.toggle("hidden");
+            console.log(mobileMenu);
+        });
+    }
+
+    // 모바일 대학교 하위 메뉴 토글
+    if (mobileUniBtn && mobileUniMenu) {
+        mobileUniBtn.addEventListener("click", (e) => {
+            console.log("univ menu btn click");
+            e.stopPropagation();
+            mobileUniMenu.classList.toggle("hidden");
+            mobileUniBtn.querySelector("i").classList.toggle("rotate-180");
+        });
+    }
+
+    // 데스크탑 대학교 메뉴 토글
+    if (uniBtn && uniMenu) {
+        uniBtn.addEventListener("click", (e) => {
+            e.stopPropagation();
+            uniMenu.classList.toggle("hidden");
+        });
+
+        document.addEventListener("click", (e) => {
+            if (!uniBtn.contains(e.target) && !uniMenu.contains(e.target)) {
+                uniMenu.classList.add("hidden");
+            }
+        });
+    }
 });
\ No newline at end of file
diff --git a/src/main/resources/static/js/homepage/url.js b/src/main/resources/static/js/homepage/common/url.js
similarity index 96%
rename from src/main/resources/static/js/homepage/url.js
rename to src/main/resources/static/js/homepage/common/url.js
index 4962e3a..6891e27 100644
--- a/src/main/resources/static/js/homepage/url.js
+++ b/src/main/resources/static/js/homepage/common/url.js
@@ -1,13 +1,13 @@
-const surveyUrl = "/api/v1/survey"
-const surveyAdminUrl = "/api/v1/survey/admin"
-
-const memberUrl = "/api/v1/member"
-const memberAdminUrl = "/api/v1/member/admin"
-
-const profileUrl = "/api/v1/profile"
-
-
-const fileUrl="/api/v1/file"
-const fileAdminUrl="/api/v1/file"
-
+const surveyUrl = "/api/v1/survey"
+const surveyAdminUrl = "/api/v1/survey/admin"
+
+const memberUrl = "/api/v1/member"
+const memberAdminUrl = "/api/v1/member/admin"
+
+const profileUrl = "/api/v1/profile"
+
+
+const fileUrl="/api/v1/file"
+const fileAdminUrl="/api/v1/file"
+
 // <script src="/js/homepage/url.js"></script>
\ No newline at end of file
diff --git a/src/main/resources/static/js/homepage/lib/apiClient.js b/src/main/resources/static/js/homepage/lib/apiClient.js
new file mode 100644
index 0000000..bf0aba2
--- /dev/null
+++ b/src/main/resources/static/js/homepage/lib/apiClient.js
@@ -0,0 +1,161 @@
+// /static/js/lib/apiClient.js
+import { Notifier } from "./notifier.js";
+
+const DEFAULTS = {
+    baseURL: "",                  // 필요 시 "/api/v1"
+    csrfHeader: "X-CSRF-TOKEN",   // 사용 중이면 이름 맞춰 넣기
+    csrfTokenSelector: 'meta[name="_csrf"]',
+    // 서버 ErrorCode 매핑(원하는 문구로 쉽게 덮어쓰기 가능)
+    errorMap: {
+        "FILE-0000": "허용되지 않는 확장자입니다.",
+        "FILE-0001": "파일을 읽는 중 오류가 발생했습니다.",
+        "FILE-0002": "해당 파일을 찾을 수 없습니다.",
+        "FILE-0003": "파일 업로드 기록을 가져올 수 없습니다.",
+        "FILE-0004": "파일 사이즈가 너무 큽니다.",
+        "COMMON400": "잘못된 요청입니다.",
+        "COMMON401": "인증이 필요합니다.",
+        "COMMON403": "접근이 금지되었습니다.",
+        "COMMON500": "서버 에러가 발생했습니다."
+    }
+};
+
+export const api = {
+    config: { ...DEFAULTS },
+
+    setBaseURL(url) { this.config.baseURL = url; },
+    setErrorMap(map) { this.config.errorMap = { ...this.config.errorMap, ...map }; },
+    setCsrf(headerName, selector = 'meta[name="_csrf"]') {
+        this.config.csrfHeader = headerName; this.config.csrfTokenSelector = selector;
+    },
+
+    // ---------- public methods ----------
+    get(url, opts = {})          { return this._request("GET", url, null, opts); },
+    delete(url, opts = {})       { return this._request("DELETE", url, null, opts); },
+    postJson(url, json, opts={}) { return this._request("POST", url, JSON.stringify(json), { ...opts, headers: { "Content-Type": "application/json", ...(opts.headers||{}) } }); },
+    putJson(url, json, opts={})  { return this._request("PUT", url,  JSON.stringify(json), { ...opts, headers: { "Content-Type": "application/json", ...(opts.headers||{}) } }); },
+    postMultipart(url, formData, opts={}) { return this._request("POST", url, formData, opts); },
+    patchMultipart(url, formData, opts = {}) {return this._request("PATCH", url, formData, opts);},
+    patchJson(url, json, opts = {}) { return this._request("PATCH",url,JSON.stringify(json),{ ...opts, headers: { "Content-Type": "application/json", ...(opts.headers || {}) } }); },
+
+    // ---------- core ----------
+    async _request(method, url, body, opts) {
+        const full = this.config.baseURL ? this.config.baseURL + url : url;
+
+        const headers = new Headers(opts?.headers || {});
+        // CSRF 자동 주입(있을 때만)
+        const tokenEl = document.querySelector(this.config.csrfTokenSelector);
+        if (tokenEl && !headers.has(this.config.csrfHeader)) {
+            headers.set(this.config.csrfHeader, tokenEl.getAttribute("content"));
+        }
+
+        let res;
+        try {
+            res = await fetch(full, {
+                method,
+                headers,
+                body,
+                credentials: opts?.credentials ?? "same-origin",
+                signal: opts?.signal
+            });
+        } catch (e) {
+            console.log("res 중에 오류");
+            Notifier.modal("네트워크 오류", "서버에 연결할 수 없습니다. 잠시 후 다시 시도해주세요.");
+            throw e;
+        }
+
+        console.debug("[api] <-", res.status, res.statusText, "for", method, url);
+
+        if (!res.ok) {
+            console.log("!res.ok 진입");
+            const err = await parseErrorResponse(res);
+            handleError(err, res.status, this.config.errorMap);
+            const serverMsg = typeof err.raw === "string" ? err.raw : (err.message || "");
+            const e = new Error(serverMsg || `HTTP ${res.status}`);
+            e.code   = err.code || null;
+            e.status = res.status;
+            e.payload = err.raw;
+            throw e;
+        }
+
+        // content-type 따라 자동 파싱
+        const ct = res.headers.get("Content-Type") || "";
+        if (ct.includes("application/json")){
+            const j = await res.json();
+            if (j && typeof j === "object" && "isSuccess" in j) {
+                if (j.isSuccess === false) {
+                    const err = {
+                        code: j.code ?? null,
+                        message: j.message ?? null,
+                        httpStatus: j.httpStatus ?? 400, // 표시용 상태(서버가 200으로 줘도 OK)
+                        raw: j
+                    };
+                    console.error("[API ERROR LOGICAL]", err.httpStatus, err.code, err.message, err.raw);
+                    handleError(err, err.httpStatus, this.config.errorMap);
+
+                    const e = new Error(err.message || "Logical failure");
+                    e.code = err.code; e.status = err.httpStatus; e.payload = err.raw;
+                    throw e;
+                }
+                return ("result" in j ? j.result : j);
+            }
+            return res.json();
+        }
+        if (ct.startsWith("text/"))          return res.text();
+        return res; // 파일/바이너리 응답 등
+    }
+};
+
+// ---------- helpers ----------
+async function parseErrorResponse(res) {
+    try {
+           const r2 = res.clone();
+           const ct = r2.headers.get("Content-Type") || "";
+           if (ct.includes("application/json")) {
+                 const j = await r2.json();
+
+            // 다양한 래핑 가능성 방어: {reason:{...}}, {error:{...}}, 최상위 ...
+            const pick = (obj) => {
+                if (!obj || typeof obj !== "object") return {};
+                if ("code" in obj || "message" in obj || "httpStatus" in obj || "isSuccess" in obj) return obj;
+                // 흔한 래핑 키
+                if (obj.reason) return obj.reason;
+                if (obj.error)  return obj.error;
+                if (obj.data && (obj.data.reason || obj.data.error)) return obj.data.reason || obj.data.error;
+                return obj;
+            };
+
+            const p = pick(j);
+            return {
+                code: p.code ?? null,
+                message: p.message ?? null,
+                httpStatus: p.httpStatus ?? res.status,
+                isSuccess: typeof p.isSuccess === "boolean" ? p.isSuccess : false,
+                raw: j
+            };
+        }
+        const t = await r2.text();
+        return { code: null, message: t || null, httpStatus: res.status, isSuccess: false, raw: t };
+    } catch {
+        return { code: null, message: null, httpStatus: res.status, isSuccess: false, raw: null };
+    }
+}
+
+function handleError(err, status, errorMap) {
+    // HTTP 상태 우선 처리
+    if (status === 413) return Notifier.modal("업로드 실패", "파일이 너무 큽니다. 용량을 줄여 다시 시도해주세요. (413)");
+    if (status === 415) return Notifier.modal("요청 형식 오류", "지원하지 않는 콘텐츠 형식입니다. (415)");
+    if (status === 403) return Notifier.modal("권한 없음", "요청이 거부되었습니다. 로그인/권한을 확인해주세요. (403)");
+    if (status === 401) return Notifier.modal("인증 필요", "로그인 세션이 만료되었을 수 있습니다. 다시 로그인해주세요. (401)");
+
+    // 서버 커스텀 코드/메시지
+    if (err.code && errorMap[err.code]) {
+        return Notifier.modal("요청 실패", errorMap[err.code]);
+    }
+    if (err.message) {
+        return Notifier.modal("요청 실패", err.message);
+    }
+    Notifier.modal("요청 실패", "알 수 없는 오류가 발생했습니다. 잠시 후 다시 시도해주세요.");
+}
+
+// (선택) 레거시 페이지 지원
+// window.api = api;
diff --git a/src/main/resources/static/js/homepage/lib/notifier.js b/src/main/resources/static/js/homepage/lib/notifier.js
new file mode 100644
index 0000000..f3951e9
--- /dev/null
+++ b/src/main/resources/static/js/homepage/lib/notifier.js
@@ -0,0 +1,57 @@
+// /static/js/lib/notifier.js
+export const Notifier = {
+    modal(title, message, okText = "닫기") {
+        const wrap = document.createElement("div");
+        wrap.className = "fixed inset-0 z-[9999] flex items-center justify-center";
+        wrap.style.background = "rgba(0,0,0,.45)";
+
+        const box = document.createElement("div");
+        box.style.maxWidth = "520px";
+        box.style.width = "92%";
+        box.style.background = "#fff";
+        box.style.borderRadius = "16px";
+        box.style.padding = "20px 24px";
+        box.style.boxShadow = "0 10px 30px rgba(0,0,0,.2)";
+        box.innerHTML = `
+      <div style="display:flex;justify-content:center;align-items:center;margin-bottom:12px;">
+        <div style="width:56px;height:56px;border-radius:999px;background:#fee2e2;display:flex;align-items:center;justify-content:center;font-size:26px;color:#ef4444;">!</div>
+      </div>
+      <h3 style="text-align:center;font-weight:700;font-size:18px;margin:0 0 6px;">${escapeHtml(title)}</h3>
+      <p style="text-align:center;color:#4b5563;margin:0 0 16px;white-space:pre-line;">${escapeHtml(message)}</p>
+      <div style="display:flex;justify-content:center;gap:8px;">
+        <button id="__notifier_ok__" style="padding:8px 16px;background:#ef4444;color:#fff;border:none;border-radius:10px;cursor:pointer;">${escapeHtml(okText)}</button>
+      </div>
+    `;
+        wrap.appendChild(box);
+        wrap.addEventListener("click", (e) => { if (e.target === wrap) wrap.remove(); });
+        box.querySelector("#__notifier_ok__").onclick = () => wrap.remove();
+        document.body.appendChild(wrap);
+    },
+
+    toast(message, ms = 2000) {
+        const el = document.createElement("div");
+        el.textContent = message;
+        el.style.position = "fixed";
+        el.style.left = "50%";
+        el.style.bottom = "22px";
+        el.style.transform = "translateX(-50%)";
+        el.style.background = "#111827";
+        el.style.color = "#fff";
+        el.style.padding = "10px 14px";
+        el.style.borderRadius = "10px";
+        el.style.zIndex = "9999";
+        el.style.boxShadow = "0 6px 20px rgba(0,0,0,.25)";
+        document.body.appendChild(el);
+        setTimeout(() => el.remove(), ms);
+    }
+};
+
+function escapeHtml(s) {
+    if (typeof s !== "string") return "";
+    return s.replace(/[&<>"'`=\/]/g, c => ({
+        "&":"&amp;","<":"&lt;",">":"&gt;","\"":"&quot;","'":"&#39;","`":"&#96;","=":"&#61;","/":"&#47;"
+    }[c]));
+}
+
+// (선택) 모듈 사용이 어려운 레거시 페이지 지원
+// window.Notifier = Notifier;
\ No newline at end of file
diff --git a/src/main/resources/templates/adminpage/common/leftSide.html b/src/main/resources/templates/adminpage/common/leftSide.html
index 9b1132f..d84e2be 100644
--- a/src/main/resources/templates/adminpage/common/leftSide.html
+++ b/src/main/resources/templates/adminpage/common/leftSide.html
@@ -66,17 +66,17 @@ <h1 class="font-['Pacifico'] text-2xl text-white">logo</h1>
                     학생 관리
                 </a>
             </li>
-            <li>
-                <a
-                        href="#"
-                        class="flex items-center p-3 rounded-lg text-gray-300 hover:bg-gray-700 transition-colors"
-                >
-                    <div class="w-5 h-5 flex items-center justify-center mr-3">
-                        <i class="ri-settings-line"></i>
-                    </div>
-                    시스템 설정
-                </a>
-            </li>
+<!--            <li>-->
+<!--                <a-->
+<!--                        href="#"-->
+<!--                        class="flex items-center p-3 rounded-lg text-gray-300 hover:bg-gray-700 transition-colors"-->
+<!--                >-->
+<!--                    <div class="w-5 h-5 flex items-center justify-center mr-3">-->
+<!--                        <i class="ri-settings-line"></i>-->
+<!--                    </div>-->
+<!--                    시스템 설정-->
+<!--                </a>-->
+<!--            </li>-->
         </ul>
     </nav>
 </aside>
\ No newline at end of file
diff --git a/src/main/resources/templates/adminpage/user/index.html b/src/main/resources/templates/adminpage/user/index.html
index d7a30eb..54c0fcd 100644
--- a/src/main/resources/templates/adminpage/user/index.html
+++ b/src/main/resources/templates/adminpage/user/index.html
@@ -71,14 +71,9 @@ <h1 class="text-3xl font-bold text-white">관리자 대시보드</h1>
                     <p class="text-gray-400 mt-2">시스템 현황을 한눈에 확인하세요</p>
                 </div>
                 <div class="flex items-center space-x-4">
-                    <div class="bg-red-500 text-white px-3 py-1 rounded-full text-sm">
-                        <div
-                                class="w-4 h-4 inline-flex items-center justify-center mr-1"
-                        >
-                            <i class="ri-notification-line ri-sm"></i>
-                        </div>
-                        5개 대기
-                    </div>
+<!--                    <div c&lt;!&ndash;lass="bg-red-500 text-white px-3 py-1 rounded-full text-sm">-->
+<!--                        -->
+<!--                    </div>&ndash;&gt;-->
                     <div class="text-right">
                         <p class="text-white font-medium">김관리자</p>
                         <p class="text-sm text-gray-400">최고 관리자</p>
@@ -150,7 +145,7 @@ <h2 class="text-xl font-bold text-white flex items-center">
                         >
                             <i class="ri-login-box-line"></i>
                         </div>
-                        최근 로그인 기록 - 수정 필요
+                        최근 로그인 기록
                     </h2>
                     <button class="text-gray-400 hover:text-white transition-colors">
                         <div class="w-5 h-5 flex items-center justify-center">
@@ -186,14 +181,14 @@ <h2 class="text-xl font-bold text-white flex items-center">
                     설문조사 참여 현황-수정필요
                 </h2>
                 <div class="flex items-center space-x-4">
-                    <select
-                            class="bg-gray-700 text-white px-3 py-2 rounded-lg text-sm border-none pr-8"
-                    >
-                        <option>전체 기간</option>
-                        <option>최근 7일</option>
-                        <option>최근 30일</option>
-                    </select>
-                    <button class="text-gray-400 hover:text-white transition-colors">
+<!--                    <select-->
+<!--                            class="bg-gray-700 text-white px-3 py-2 rounded-lg text-sm border-none pr-8"-->
+<!--                    >-->
+<!--                        <option>전체 기간</option>-->
+<!--                        <option>최근 7일</option>-->
+<!--                        <option>최근 30일</option>-->
+<!--                    </select>-->
+                    <button id="refresh-survey-answer" class="text-gray-400 hover:text-white transition-colors">
                         <div class="w-5 h-5 flex items-center justify-center">
                             <i class="ri-refresh-line"></i>
                         </div>
@@ -217,79 +212,8 @@ <h2 class="text-xl font-bold text-white flex items-center">
                         <th class="p-3 text-sm font-medium text-gray-300">상태</th>
                     </tr>
                     </thead>
-                    <tbody>
-                    <tr class="table-row border-b border-gray-700">
-                        <td class="p-3 text-white">안지영</td>
-                        <td class="p-3 text-gray-300">고객 만족도 조사</td>
-                        <td class="p-3 text-gray-400">2025-01-09 08:15</td>
-                        <td class="p-3 text-gray-300">12분</td>
-                        <td class="p-3">
-                    <span
-                            class="status-badge px-2 py-1 bg-green-500 bg-opacity-20 text-green-400 text-xs rounded-full"
-                    >완료</span
-                    >
-                        </td>
-                    </tr>
-                    <tr class="table-row border-b border-gray-700">
-                        <td class="p-3 text-white">류현우</td>
-                        <td class="p-3 text-gray-300">제품 개선 의견 수집</td>
-                        <td class="p-3 text-gray-400">2025-01-09 07:45</td>
-                        <td class="p-3 text-gray-300">8분</td>
-                        <td class="p-3">
-                    <span
-                            class="status-badge px-2 py-1 bg-green-500 bg-opacity-20 text-green-400 text-xs rounded-full"
-                    >완료</span
-                    >
-                        </td>
-                    </tr>
-                    <tr class="table-row border-b border-gray-700">
-                        <td class="p-3 text-white">김서현</td>
-                        <td class="p-3 text-gray-300">브랜드 인지도 조사</td>
-                        <td class="p-3 text-gray-400">2025-01-09 07:30</td>
-                        <td class="p-3 text-gray-300">15분</td>
-                        <td class="p-3">
-                    <span
-                            class="status-badge px-2 py-1 bg-yellow-500 bg-opacity-20 text-yellow-400 text-xs rounded-full"
-                    >진행중</span
-                    >
-                        </td>
-                    </tr>
-                    <tr class="table-row border-b border-gray-700">
-                        <td class="p-3 text-white">박준혁</td>
-                        <td class="p-3 text-gray-300">사용자 경험 평가</td>
-                        <td class="p-3 text-gray-400">2025-01-09 07:15</td>
-                        <td class="p-3 text-gray-300">20분</td>
-                        <td class="p-3">
-                    <span
-                            class="status-badge px-2 py-1 bg-green-500 bg-opacity-20 text-green-400 text-xs rounded-full"
-                    >완료</span
-                    >
-                        </td>
-                    </tr>
-                    <tr class="table-row border-b border-gray-700">
-                        <td class="p-3 text-white">이소영</td>
-                        <td class="p-3 text-gray-300">신기능 피드백</td>
-                        <td class="p-3 text-gray-400">2025-01-09 06:50</td>
-                        <td class="p-3 text-gray-300">5분</td>
-                        <td class="p-3">
-                    <span
-                            class="status-badge px-2 py-1 bg-red-500 bg-opacity-20 text-red-400 text-xs rounded-full"
-                    >중단</span
-                    >
-                        </td>
-                    </tr>
-                    <tr class="table-row">
-                        <td class="p-3 text-white">정민석</td>
-                        <td class="p-3 text-gray-300">시장 동향 분석</td>
-                        <td class="p-3 text-gray-400">2025-01-09 06:30</td>
-                        <td class="p-3 text-gray-300">18분</td>
-                        <td class="p-3">
-                    <span
-                            class="status-badge px-2 py-1 bg-green-500 bg-opacity-20 text-green-400 text-xs rounded-full"
-                    >완료</span
-                    >
-                        </td>
-                    </tr>
+                    <tbody id="survey-answer-body">
+
                     </tbody>
                 </table>
             </div>
@@ -557,7 +481,6 @@ <h3 class="text-xl font-bold text-white mb-4">회원가입 승인</h3>
             modal.classList.remove("hidden");
             modal.classList.add("flex");
         }
-
         function hideModal(modal) {
             modal.classList.add("hidden");
             modal.classList.remove("flex");
@@ -565,63 +488,45 @@ <h3 class="text-xl font-bold text-white mb-4">회원가입 승인</h3>
 
         const viewDetailsButtons = document.querySelectorAll(".view-details-btn");
 
-
         viewDetailsButtons.forEach((button) => {
             button.addEventListener("click", function () {
                 const row = this.closest("tr");
-                const name = row.cells[1].textContent;
-                const email = row.cells[2].textContent;
-                const joinDate = row.cells[3].textContent;
-                const lastLogin = "2025-07-11"
+                const name = row.cells[0]?.textContent?.trim() || "-";
+                const email = row.cells[1]?.textContent?.trim() || "-";
+                const joinDate = row.cells[2]?.textContent?.trim() || "-";
+                const lastLogin = "2025-07-11";
                 const isActive = true;
+
                 document.getElementById("detail-name").textContent = name;
                 document.getElementById("detail-email").textContent = email;
                 document.getElementById("detail-join-date").textContent = joinDate;
                 document.getElementById("detail-last-login").textContent = lastLogin;
-                document.getElementById("detail-status").textContent = isActive
-                    ? "활성"
-                    : "비활성";
-                document.getElementById(
-                    "detail-status",
-                ).previousElementSibling.className = isActive
-                    ? "w-2 h-2 rounded-full bg-green-500 mr-2"
-                    : "w-2 h-2 rounded-full bg-red-500 mr-2";
+                document.getElementById("detail-status").textContent = isActive ? "활성" : "비활성";
+                document.getElementById("detail-status").previousElementSibling.className =
+                    isActive ? "w-2 h-2 rounded-full bg-green-500 mr-2" : "w-2 h-2 rounded-full bg-red-500 mr-2";
+
                 showModal(userDetailsModal);
             });
         });
-        document
-            .getElementById("close-details")
-            .addEventListener("click", () => hideModal(userDetailsModal));
-        document
-            .getElementById("close-details-btn")
-            .addEventListener("click", () => hideModal(userDetailsModal));
-        const documentPreviewModal = document.getElementById(
-            "document-preview-modal",
-        );
-        const viewBusinessRegistrationBtn = document.getElementById(
-            "view-business-registration",
-        );
+
+        document.getElementById("close-details").addEventListener("click", () => hideModal(userDetailsModal));
+        document.getElementById("close-details-btn").addEventListener("click", () => hideModal(userDetailsModal));
+
+        const documentPreviewModal = document.getElementById("document-preview-modal");
+        const viewBusinessRegistrationBtn = document.getElementById("view-business-registration");
         const closePreviewButtons = document.querySelectorAll(".close-preview");
-        viewBusinessRegistrationBtn.addEventListener("click", () => {
-            showModal(documentPreviewModal);
-        });
+
+        viewBusinessRegistrationBtn.addEventListener("click", () => showModal(documentPreviewModal));
         closePreviewButtons.forEach((button) => {
             button.addEventListener("click", () => hideModal(documentPreviewModal));
         });
-        [
-            userDetailsModal,
-            documentPreviewModal,
-        ].forEach((modal) => {
+
+        [userDetailsModal, documentPreviewModal].forEach((modal) => {
             modal.addEventListener("click", function (e) {
-                if (e.target === modal) {
-                    hideModal(modal);
-                }
+                if (e.target === modal) hideModal(modal);
             });
         });
     });
-
-
-
 </script>
 
 <script id="login-log-fetch">
@@ -698,5 +603,97 @@ <h3 class="text-xl font-bold text-white mb-4">회원가입 승인</h3>
         });
     });
 </script>
+
+<script id="survey-answer-fetch">
+    document.addEventListener("DOMContentLoaded", () => {
+        const tbody = document.getElementById("survey-answer-body");
+        const refreshBtn = document.getElementById("refresh-survey-answer");
+
+        const statusClass = (status) => {
+            // finishStatus 예시: "완료", "진행중", "중단"
+            if (!status) return "bg-gray-500 bg-opacity-20 text-gray-300";
+            if (status.includes("완료")) return "bg-green-500 bg-opacity-20 text-green-400";
+            if (status.includes("진행")) return "bg-yellow-500 bg-opacity-20 text-yellow-400";
+            if (status.includes("중단") || status.includes("실패")) return "bg-red-500 bg-opacity-20 text-red-400";
+            return "bg-gray-500 bg-opacity-20 text-gray-300";
+        };
+
+        const fmtTime = (s) => {
+            // submitTime이 이미 'yyyy-MM-dd HH:mm'로 내려오면 그대로 표기
+            return s || "-";
+        };
+
+        const fmtSpend = (v) => {
+            // spendTime: 분 기준이라고 가정 (Long)
+            if (v == null) return "-";
+            const minutes = Number(v);
+            if (Number.isNaN(minutes)) return "-";
+            if (minutes >= 60) {
+                const h = Math.floor(minutes / 60);
+                const m = minutes % 60;
+                return m ? `${h}시간 ${m}분` : `${h}시간`;
+            }
+            return `${minutes}분`;
+        };
+
+        async function loadSurveyAnswers() {
+            try {
+                const res = await fetch("/api/v1/survey/admin/answer");
+                if (!res.ok) throw new Error("서버 오류");
+                const json = await res.json();
+
+                const list = json.result || json.data || json || [];
+                tbody.innerHTML = "";
+
+                if (!Array.isArray(list) || list.length === 0) {
+                    tbody.innerHTML = `
+            <tr>
+              <td colspan="5" class="p-3 text-center text-gray-400">참여 기록이 없습니다.</td>
+            </tr>`;
+                    return;
+                }
+
+                const frag = document.createDocumentFragment();
+                list.forEach((row) => {
+                    const tr = document.createElement("tr");
+                    tr.className = "table-row border-b border-gray-700";
+                    tr.innerHTML = `
+            <td class="p-3 text-white">${row.memberName ?? "알 수 없음"}</td>
+            <td class="p-3 text-gray-300">${row.surveyName ?? "-"}</td>
+            <td class="p-3 text-gray-400">${fmtTime(row.submitTime)}</td>
+            <td class="p-3 text-gray-300">${fmtSpend(row.spendTime)}</td>
+            <td class="p-3">
+              <span class="status-badge px-2 py-1 ${statusClass(row.finishStatus)} text-xs rounded-full">
+                ${row.finishStatus ?? "-"}
+              </span>
+            </td>
+          `;
+                    frag.appendChild(tr);
+                });
+                tbody.appendChild(frag);
+            } catch (e) {
+                console.error("설문 현황 로드 실패:", e);
+                tbody.innerHTML = `
+          <tr>
+            <td colspan="5" class="p-3 text-center text-red-400">데이터 로드 중 오류가 발생했습니다.</td>
+          </tr>`;
+            }
+        }
+
+        // 최초 로드 + 새로고침
+        loadSurveyAnswers();
+        if (refreshBtn) {
+            refreshBtn.addEventListener("click", () => {
+                refreshBtn.classList.add("animate-spin");
+                loadSurveyAnswers().finally(() => {
+                    setTimeout(() => refreshBtn.classList.remove("animate-spin"), 600);
+                });
+            });
+        }
+    });
+</script>
+
+
+
 </body>
 </html>
diff --git a/src/main/resources/templates/adminpage/user/login.html b/src/main/resources/templates/adminpage/user/login.html
index 330d8aa..4099383 100644
--- a/src/main/resources/templates/adminpage/user/login.html
+++ b/src/main/resources/templates/adminpage/user/login.html
@@ -333,6 +333,6 @@ <h3 class="text-lg font-medium text-gray-900 mb-2">로그인 실패</h3>
         });
     });
 </script>
-<script src="/js/homepage/url.js"></script>
+<script src="/js/homepage/common/url.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/adminpage/user/member/manageUser.html b/src/main/resources/templates/adminpage/user/member/manageUser.html
index c54dab5..8f0ae1b 100644
--- a/src/main/resources/templates/adminpage/user/member/manageUser.html
+++ b/src/main/resources/templates/adminpage/user/member/manageUser.html
@@ -157,14 +157,14 @@ <h1 class="text-3xl font-bold text-white">사용자 관리</h1>
                     </p>
                 </div>
                 <div class="flex items-center space-x-4">
-                    <div class="bg-red-500 text-white px-3 py-1 rounded-full text-sm">
-                        <div
-                                class="w-4 h-4 inline-flex items-center justify-center mr-1"
-                        >
-                            <i class="ri-notification-line ri-sm"></i>
-                        </div>
-                        5개 대기
-                    </div>
+<!--                    <div class="bg-red-500 text-white px-3 py-1 rounded-full text-sm">-->
+<!--                        <div-->
+<!--                                class="w-4 h-4 inline-flex items-center justify-center mr-1"-->
+<!--                        >-->
+<!--                            <i class="ri-notification-line ri-sm"></i>-->
+<!--                        </div>-->
+<!--                        5개 대기-->
+<!--                    </div>-->
                     <div class="text-right">
                         <p class="text-white font-medium">김관리자</p>
                         <p class="text-sm text-gray-400">최고 관리자</p>
diff --git a/src/main/resources/templates/adminpage/user/school/manageSchool.html b/src/main/resources/templates/adminpage/user/school/manageSchool.html
index 3b5a48d..22bf274 100644
--- a/src/main/resources/templates/adminpage/user/school/manageSchool.html
+++ b/src/main/resources/templates/adminpage/user/school/manageSchool.html
@@ -1191,8 +1191,8 @@ <h2 class="text-xl font-bold text-white">일정 목록</h2>
                             <select
                                     class="w-full bg-gray-700 text-white px-4 py-3 rounded-lg border-none pr-8"
                             >
-                                <option>공지사항</option>
                                 <option>일반</option>
+                                <option>공지사항</option>
                             </select>
                         </div>
                     </div>
@@ -1320,8 +1320,8 @@ <h2 class="text-xl font-bold text-white">일정 목록</h2>
                             <select
                                     class="w-full bg-gray-700 text-white px-4 py-3 rounded-lg border-none pr-8"
                             >
-                                <option>공지사항</option>
                                 <option>일반</option>
+                                <option>공지사항</option>
                             </select>
                         </div>
                     </div>
diff --git a/src/main/resources/templates/adminpage/user/student/studentList.html b/src/main/resources/templates/adminpage/user/student/studentList.html
index 5194a6e..0a9f630 100644
--- a/src/main/resources/templates/adminpage/user/student/studentList.html
+++ b/src/main/resources/templates/adminpage/user/student/studentList.html
@@ -272,54 +272,30 @@ <h2 class="text-xl font-bold text-white">학생 목록</h2>
                     <tr class="table-header text-left">
                         <th
                                 class="px-3 py-2 text-sm font-medium text-gray-300 cursor-pointer hover:text-white transition-colors"
-                                onclick="sortTable('id')"
                         >
                             <div class="flex items-center">
                                 ID
-                                <div
-                                        class="w-4 h-4 flex items-center justify-center ml-1"
-                                >
-                                    <i class="ri-arrow-up-down-line text-xs"></i>
-                                </div>
                             </div>
                         </th>
                         <th
                                 class="p-4 text-sm font-medium text-gray-300 cursor-pointer hover:text-white transition-colors"
-                                onclick="sortTable('chineseName')"
                         >
                             <div class="flex items-center">
                                 중국어 이름
-                                <div
-                                        class="w-4 h-4 flex items-center justify-center ml-1"
-                                >
-                                    <i class="ri-arrow-up-down-line text-xs"></i>
-                                </div>
                             </div>
                         </th>
                         <th
                                 class="p-4 text-sm font-medium text-gray-300 cursor-pointer hover:text-white transition-colors"
-                                onclick="sortTable('englishName')"
                         >
                             <div class="flex items-center">
                                 영어 이름
-                                <div
-                                        class="w-4 h-4 flex items-center justify-center ml-1"
-                                >
-                                    <i class="ri-arrow-up-down-line text-xs"></i>
-                                </div>
                             </div>
                         </th>
                         <th
                                 class="p-4 text-sm font-medium text-gray-300 cursor-pointer hover:text-white transition-colors"
-                                onclick="sortTable('birthday')"
                         >
                             <div class="flex items-center">
                                 생년월일
-                                <div
-                                        class="w-4 h-4 flex items-center justify-center ml-1"
-                                >
-                                    <i class="ri-arrow-up-down-line text-xs"></i>
-                                </div>
                             </div>
                         </th>
                         <th class="p-4 text-sm font-medium text-gray-300">성별</th>
@@ -769,61 +745,6 @@ <h3 class="text-white text-base font-semibold">설문 선택</h3>
             return { name, gender, birthStart, birthEnd, email, passport, exam, surveyLogId, surveyTitle,agencyName };
         }
 
-        window.sortTable = function (field) {
-            if (currentSort.field === field) {
-                currentSort.direction = currentSort.direction === "asc" ? "desc" : "asc";
-            } else {
-                currentSort.field = field;
-                currentSort.direction = "asc";
-            }
-            const tbody = document.getElementById("student-table-body");
-            const rows = Array.from(tbody.getElementsByTagName("tr"));
-            rows.sort((a, b) => {
-                let aValue = a.cells[getColumnIndex(field)].textContent.trim();
-                let bValue = b.cells[getColumnIndex(field)].textContent.trim();
-                if (field === "id") {
-                    aValue = parseInt(aValue.replace("#", ""));
-                    bValue = parseInt(bValue.replace("#", ""));
-                }
-                if (field === "birthday") {
-                    aValue = new Date(aValue);
-                    bValue = new Date(bValue);
-                }
-                if (currentSort.direction === "asc") {
-                    return aValue > bValue ? 1 : -1;
-                } else {
-                    return aValue < bValue ? 1 : -1;
-                }
-            });
-            rows.forEach((row) => tbody.appendChild(row));
-            updateSortingIcons(field);
-            showNotification(
-                `${field} 기준으로 ${currentSort.direction === "asc" ? "오름차순" : "내림차순"} 정렬되었습니다`,
-            );
-        };
-        function getColumnIndex(field) {
-            const fieldMap = {
-                id: 0,
-                chineseName: 1,
-                englishName: 2,
-                birthday: 3,
-            };
-            return fieldMap[field] || 0;
-        }
-        function updateSortingIcons(currentField) {
-            const headers = document.querySelectorAll("th[onclick]");
-            headers.forEach((header) => {
-                const icon = header.querySelector("i");
-                if (header.onclick.toString().includes(currentField)) {
-                    icon.className =
-                        currentSort.direction === "asc"
-                            ? "ri-arrow-up-line text-primary text-xs"
-                            : "ri-arrow-down-line text-primary text-xs";
-                } else {
-                    icon.className = "ri-arrow-up-down-line text-xs";
-                }
-            });
-        }
         window.closeStudentModal = function () {
             document.getElementById("studentDetailModal").classList.add("hidden");
         };
diff --git a/src/main/resources/templates/homepage/common/nav-user.html b/src/main/resources/templates/homepage/common/nav-user.html
index d10661a..fd7cbc1 100644
--- a/src/main/resources/templates/homepage/common/nav-user.html
+++ b/src/main/resources/templates/homepage/common/nav-user.html
@@ -103,8 +103,7 @@
         </div>
     </div>
 
-    <script src="/js/homepage/nav-user.js" defer></script>
-    <script src="/js/homepage/login.js" defer></script>
-    <script src="/js/homepage/url.js" defer></script>
-
+    <script src="/js/homepage/common/nav-user.js" defer></script>
+    <script src="/js/homepage/common/login.js" defer></script>
+    <script src="/js/homepage/common/url.js" defer></script>
 </nav>
diff --git a/src/main/resources/templates/homepage/common/survey-make-nav.html b/src/main/resources/templates/homepage/common/survey-make-nav.html
new file mode 100644
index 0000000..40235ec
--- /dev/null
+++ b/src/main/resources/templates/homepage/common/survey-make-nav.html
@@ -0,0 +1,14 @@
+<header class="bg-white border-b border-gray-200 sticky top-0 z-10" th:fragment="survey-make-nav">
+    <div class="container mx-auto px-4">
+        <div class="flex items-center h-16">
+            <a href="/survey/list" data-readdy="true" class="flex items-center text-gray-600 hover:text-primary">
+                <i class="ri-arrow-left-line mr-2"></i>
+                <span>설문조사 목록으로 돌아가기</span>
+            </a>
+            <div class="mx-auto text-lg font-medium"></div>
+            <div class="w-10 h-10 flex items-center justify-center rounded-full bg-primary text-white">
+                <span>관</span>
+            </div>
+        </div>
+    </div>
+</header>
\ No newline at end of file
diff --git a/src/main/resources/templates/homepage/common/survey-nav.html b/src/main/resources/templates/homepage/common/survey-nav.html
index db4e23b..ee1bf30 100644
--- a/src/main/resources/templates/homepage/common/survey-nav.html
+++ b/src/main/resources/templates/homepage/common/survey-nav.html
@@ -18,14 +18,14 @@
                             설문조사 목록
                         </a>
                     </button>
-                    <button
-                            th:if="${loginMember.isAdmin}"
-                            th:classappend="${requestURI == '/survey/make' ? 'px-4 py-2 text-primary border-b-2 border-primary font-medium' : 'px-4 py-2 text-gray-500 hover:text-gray-700 font-medium'}"
-                    >
-                        <a href="/survey/make">
-                            설문조사 생성
-                        </a>
-                    </button>
+<!--                    <button-->
+<!--                            th:if="${loginMember.isAdmin}"-->
+<!--                            th:classappend="${requestURI == '/survey/make' ? 'px-4 py-2 text-primary border-b-2 border-primary font-medium' : 'px-4 py-2 text-gray-500 hover:text-gray-700 font-medium'}"-->
+<!--                    >-->
+<!--                        <a href="/survey/make">-->
+<!--                            설문조사 생성-->
+<!--                        </a>-->
+<!--                    </button>-->
                 </div>
             </div>
             <div class="flex items-center space-x-4">
diff --git a/src/main/resources/templates/homepage/user/agency/agency-introduction.html b/src/main/resources/templates/homepage/user/agency/agency-introduction.html
index 1719858..1e6b64b 100644
--- a/src/main/resources/templates/homepage/user/agency/agency-introduction.html
+++ b/src/main/resources/templates/homepage/user/agency/agency-introduction.html
@@ -591,5 +591,9 @@ <h3 class="text-lg font-semibold mb-4">연락처</h3>
         });
     });
 </script>
+<script type="module">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    api.setBaseURL("/api/v1");   // 필요하면 설정
+</script>
 </body>
 </html>
diff --git a/src/main/resources/templates/homepage/user/forgetPassword.html b/src/main/resources/templates/homepage/user/forgetPassword.html
index f15af3d..a4c7ee1 100644
--- a/src/main/resources/templates/homepage/user/forgetPassword.html
+++ b/src/main/resources/templates/homepage/user/forgetPassword.html
@@ -121,7 +121,14 @@ <h2 class="mt-6 text-2xl font-bold text-gray-900">비밀번호 찾기</h2>
     </div>
 </footer>
 
-<script src="/js/homepage/url.js"></script>
+<script src="/js/homepage/common/url.js"></script>
+
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+
 <script>
     document.addEventListener("DOMContentLoaded", () => {
         const form = document.getElementById("forgotForm");
@@ -135,20 +142,9 @@ <h2 class="mt-6 text-2xl font-bold text-gray-900">비밀번호 찾기</h2>
             const dto = { email: email, name: name };
 
             try {
-                const response = await fetch(memberUrl + "/reset/email", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify(dto)
-                });
-
-                const result = await response.json();
-
-                if (response.ok && result.isSuccess) {
-                    alert("입력하신 이메일로 인증 링크를 보냈습니다. 메일함을 확인해주세요.");
-                    window.location.href = "/member/login";
-                } else {
-                    alert(result.message || "입력하신 정보가 일치하지 않습니다.");
-                }
+                await api.postJson(`${memberUrl}/reset/email`, dto);
+                 alert("입력하신 이메일로 인증 링크를 보냈습니다. 메일함을 확인해주세요.");
+                 window.location.href = "/member/login";
             } catch (error) {
                 console.error("🚨 서버 오류:", error);
                 alert("서버와 통신 중 문제가 발생했습니다.");
diff --git a/src/main/resources/templates/homepage/user/index.html b/src/main/resources/templates/homepage/user/index.html
index 219b43d..f82486f 100644
--- a/src/main/resources/templates/homepage/user/index.html
+++ b/src/main/resources/templates/homepage/user/index.html
@@ -325,7 +325,7 @@ <h3 class="text-lg font-semibold mb-4">연락처</h3>
         </div>
     </div>
 </footer>
-<script src="/js/homepage/url.js"></script>
+<script src="/js/homepage/common/url.js"></script>
 <!-- 도시 탭 스크립트 -->
 <script id="city-tab-script">
     document.addEventListener("DOMContentLoaded", function () {
diff --git a/src/main/resources/templates/homepage/user/login.html b/src/main/resources/templates/homepage/user/login.html
index 23087c7..f0e5577 100644
--- a/src/main/resources/templates/homepage/user/login.html
+++ b/src/main/resources/templates/homepage/user/login.html
@@ -160,14 +160,14 @@ <h2 class="mt-6 text-2xl font-bold text-gray-900">로그인</h2>
                             type="checkbox"
                             class="hidden"
                     />
-                    <label for="remember-me" class="flex items-center cursor-pointer">
-                        <div
-                                class="w-5 h-5 border border-gray-300 rounded flex items-center justify-center mr-2 custom-checkbox"
-                        >
-                            <i class="ri-check-line text-white text-xs hidden"></i>
-                        </div>
-                        <span class="text-sm text-gray-700">로그인 상태 유지</span>
-                    </label>
+<!--                    <label for="remember-me" class="flex items-center cursor-pointer">-->
+<!--                        <div-->
+<!--                                class="w-5 h-5 border border-gray-300 rounded flex items-center justify-center mr-2 custom-checkbox"-->
+<!--                        >-->
+<!--                            <i class="ri-check-line text-white text-xs hidden"></i>-->
+<!--                        </div>-->
+<!--                        <span class="text-sm text-gray-700">로그인 상태 유지</span>-->
+<!--                    </label>-->
                 </div>
 
                 <div>
@@ -202,6 +202,12 @@ <h2 class="mt-6 text-2xl font-bold text-gray-900">로그인</h2>
         </div>
     </div>
 </footer>
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+
 <script id="login">
     document.addEventListener("DOMContentLoaded", () => {
         const form = document.querySelector("form");
@@ -215,51 +221,23 @@ <h2 class="mt-6 text-2xl font-bold text-gray-900">로그인</h2>
             const loginDto = { email, password };
 
             try {
-                const response = await fetch(memberUrl + "/login", {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                    body: JSON.stringify(loginDto)
-                });
-
-                const responseBody = await response.json();
-
-                // ✅ 로그인 성공
-                if (response.ok && responseBody.isSuccess) {
-                    showModal({
-                        type: "success",
-                        title: "로그인 성공!",
-                        message: "환영합니다. 로그인이 완료되었습니다.",
-                        buttonText: "확인",
-                        onClose: () => window.location.href = "/home"
-                    });
-                    return;
-                }
-
-                // ✅ 로그인 실패 (BaseResponse.isSuccess=false)
-                console.warn("❌ 로그인 실패:", responseBody);
-
-                let errorMessage = "로그인에 실패했습니다. 잠시 후 다시 시도해주세요.";
-                console.log("responseBody:"+responseBody);
-                if (responseBody.message) errorMessage = responseBody.message;
-
-
-                showModal({
-                    type: "error",
-                    title: "로그인 실패",
-                    message: errorMessage,
-                    buttonText: "다시 시도"
-                });
-
+                await api.postJson(`${memberUrl}/login`, loginDto);
+                 showModal({
+                       type: "success",
+                         title: "로그인 성공!",
+                       message: "환영합니다. 로그인이 완료되었습니다.",
+                       buttonText: "확인",
+                       onClose: () => window.location.href = "/home"
+                     });
+                 return;
             } catch (err) {
                 console.error("🚨 네트워크 또는 서버 오류:", err);
-                showModal({
-                    type: "error",
-                    title: "서버 오류",
-                    message: "로그인 중 오류가 발생했습니다. 네트워크 상태를 확인해주세요.",
-                    buttonText: "확인"
-                });
+                 showModal({
+                       type: "error",
+                       title: "로그인 실패",
+                       message: err?.message || "로그인 중 오류가 발생했습니다. 네트워크 상태를 확인해주세요.",
+                       buttonText: "확인"
+                 });
             }
         });
 
@@ -350,6 +328,6 @@ <h3 class="text-lg font-medium text-gray-900 mb-2">${title}</h3>
         });
     });
 </script>
-<script src="/js/homepage/url.js"></script>
+<script src="/js/homepage/common/url.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/homepage/user/member/profile.html b/src/main/resources/templates/homepage/user/member/profile.html
index fd38e26..e1ee78e 100644
--- a/src/main/resources/templates/homepage/user/member/profile.html
+++ b/src/main/resources/templates/homepage/user/member/profile.html
@@ -745,6 +745,14 @@ <h1 class="text-xl font-['Pacifico'] text-primary">logo</h1>
         </div>
     </div>
 </footer>
+
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    api.setBaseURL("/api/v1");
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+
 <script id="profileEditHandler">
     document.addEventListener("DOMContentLoaded", function () {
         const editProfileBtn = document.getElementById("editProfileBtn");
@@ -770,33 +778,14 @@ <h1 class="text-xl font-['Pacifico'] text-primary">logo</h1>
             };
 
             try {
-                const res = await fetch("/api/v1/profile/member", {
-                    method: "PATCH",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                    body: JSON.stringify(payload)
-                });
-
-                if (!res.ok) {
-                    const txt = await res.text().catch(()=> "");
-                    alert("프로필 저장 실패\n" + txt);
-                    return;
-                }
-
-                // 성공 처리
+                await window.api.patchJson("/profile/member", payload);
                 editProfileModal.classList.add("hidden");
-                successToast.classList.remove("hidden");
-                successToast.classList.remove("translate-y-full", "opacity-0");
-
-                // 최신 데이터 반영을 확실히: 새로고침(간단)
-                setTimeout(() => { location.reload(); }, 800);
-
+                successToast.classList.remove("hidden", "translate-y-full", "opacity-0");
+                setTimeout(() => location.reload(), 800);
             } catch (e) {
                 console.error(e);
-                alert("프로필 저장 중 오류가 발생했습니다.");
             }
-        });
+        }, { once: true });
 
         // 모달 바깥 클릭 닫기
         window.addEventListener("click", (e) => {
@@ -832,29 +821,13 @@ <h1 class="text-xl font-['Pacifico'] text-primary">logo</h1>
             };
 
             try {
-                const res = await fetch("/api/v1/profile/agency", {
-                    method: "PATCH",
-                    headers: {
-                        "Content-Type": "application/json"
-                    },
-                    body: JSON.stringify(payload)
-                });
-
-                if (!res.ok) {
-                    const txt = await res.text().catch(()=> "");
-                    alert("유학원 정보 저장 실패\n" + txt);
-                    return;
-                }
+                await window.api.patchJson("/profile/agency", payload);
 
                 editAgencyModal.classList.add("hidden");
-                agencySuccessToast.classList.remove("hidden");
-                agencySuccessToast.classList.remove("translate-y-full", "opacity-0");
-
+                agencySuccessToast.classList.remove("hidden", "translate-y-full", "opacity-0");
                 setTimeout(() => { location.reload(); }, 800);
-
             } catch (e) {
                 console.error(e);
-                alert("유학원 정보 저장 중 오류가 발생했습니다.");
             }
         });
 
@@ -863,42 +836,53 @@ <h1 class="text-xl font-['Pacifico'] text-primary">logo</h1>
         });
     });
 </script>
-<script>
+<script th:inline="javascript">
     // 현재 저장된 지역(초기 선택값) — Thymeleaf 사용 중이면 아래 한 줄을 그대로 쓰세요.
     const CURRENT_REGION = /*[[${profileDto.member.agencyRegion}]]*/ '';
 
-    async function populateAgencyRegions() {
-        const select = document.getElementById('editAgencyRegion');
-        if (!select) return;
+    async function populateAgencyRegions(selectEl) {
+        // 선택 요소 결정 (파라미터 우선, 없으면 기본 ID)
+        const sel = selectEl ?? document.getElementById("editAgencyRegion");
 
         try {
-            const res = await fetch('/api/v1/agency/region', { method: 'GET' });
-            if (!res.ok) throw new Error('지역 목록 조회 실패');
-            const regions = await res.json(); // ["서울", "부산", ...] 같은 label 배열
+            if (!sel) throw new Error("지역 셀렉트 요소를 찾을 수 없습니다.");
+
+            const res = await window.api.get("/agency/region");
 
-            // 기존 옵션 정리 후 기본값 추가
-            select.innerHTML = '<option value="">지역 선택</option>';
+            const regions =
+                Array.isArray(res) ? res :
+                    Array.isArray(res?.data) ? res.data :
+                        Array.isArray(res?.result) ? res.result : [];
 
-            regions.forEach((label) => {
-                const opt = document.createElement('option');
-                opt.value = label;     // 서버가 label을 받는다면 value=label
+            sel.innerHTML = '<option value="">지역 선택</option>';
+
+            regions.forEach(label => {
+                const opt = document.createElement("option");
+                opt.value = label;
                 opt.textContent = label;
-                select.appendChild(opt);
+                sel.appendChild(opt);
             });
 
-            // 현재 값이 있으면 선택
-            if (CURRENT_REGION) {
-                select.value = CURRENT_REGION;
+            if (typeof CURRENT_REGION !== "undefined" && CURRENT_REGION) {
+                sel.value = CURRENT_REGION;
+                if (sel.value !== CURRENT_REGION) {
+                    const opt = document.createElement("option");
+                    opt.value = CURRENT_REGION;
+                    opt.textContent = `${CURRENT_REGION}`;
+                    opt.selected = true;
+                    sel.appendChild(opt);
+                }
             }
         } catch (e) {
-            console.error(e);
-            // 실패 시 최소한 현재 값만이라도 표시
-            if (CURRENT_REGION) {
-                const opt = document.createElement('option');
+            console.error("지역 목록 조회 실패:", e?.status, e?.code, e?.payload || e);
+
+            if (sel && typeof CURRENT_REGION !== "undefined" && CURRENT_REGION) {
+                sel.innerHTML = ""; // 깨끗이 비우고
+                const opt = document.createElement("option");
                 opt.value = CURRENT_REGION;
-                opt.textContent = CURRENT_REGION + ' (현재)';
+                opt.textContent = `${CURRENT_REGION}`;
                 opt.selected = true;
-                document.getElementById('editAgencyRegion').appendChild(opt);
+                sel.appendChild(opt);
             }
         }
     }
@@ -991,26 +975,12 @@ <h1 class="text-xl font-['Pacifico'] text-primary">logo</h1>
                 fd.append(fileFieldName, file);
 
                 try {
-                    const res = await fetch(endpoint, {
-                        method: "PATCH",
-                        body: fd,
-                        headers: csrfToken && csrfHeader ? { [csrfHeader]: csrfToken } : undefined,
-                    });
-
-                    // 바디는 굳이 파싱 안 해도 됨 (BaseResponse<String> "success")
-                    if (!res.ok) {
-                        const text = await res.text();
-                        let msg = res.status + " " + res.statusText;
-                        try { const err = text ? JSON.parse(text) : null; if (err?.message) msg = err.message; } catch {}
-                        throw new Error(msg);
-                    }
-
+                    await window.api.patchMultipart(endpoint, fd);
                     closeModal();
                     showToast("업데이트되었습니다.");
                     location.reload();
                 } catch (err) {
                     console.error("업로드 실패:", err);
-                    alert("업로드 중 오류가 발생했습니다: " + (err?.message || "Unknown"));
                 }
             });
         };
@@ -1033,7 +1003,7 @@ <h1 class="text-xl font-['Pacifico'] text-primary">logo</h1>
             formId: "bizCertForm",
             fileInputId: "bizCertFile",
             previewId: "bizCertPreview",
-            endpoint: `${BASE}/businessCert`,
+            endpoint: `/profile/businessCert`,
             fileFieldName: "businessCertificate",
             acceptPdf: true
         });
@@ -1046,7 +1016,7 @@ <h1 class="text-xl font-['Pacifico'] text-primary">logo</h1>
             formId: "agencyPicForm",
             fileInputId: "agencyPicFile",
             previewId: "agencyPicPreview",
-            endpoint: `${BASE}/agencyPicture`,
+            endpoint: `/profile/agencyPicture`,
             fileFieldName: "agencyPicture",
             acceptPdf: false
         });
@@ -1212,6 +1182,5 @@ <h4 class="text-lg font-semibold text-gray-700">중국 주소 검색</h4>
         }
     });
 </script>
-
 </body>
 </html>
diff --git a/src/main/resources/templates/homepage/user/resetPassword.html b/src/main/resources/templates/homepage/user/resetPassword.html
index d9bbac9..402793c 100644
--- a/src/main/resources/templates/homepage/user/resetPassword.html
+++ b/src/main/resources/templates/homepage/user/resetPassword.html
@@ -121,8 +121,13 @@ <h2 class="mt-6 text-2xl font-bold text-gray-900">비밀번호 재설정</h2>
         </div>
     </div>
 </footer>
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
 
-<script src="/js/homepage/url.js"></script>
+<script src="/js/homepage/common/url.js"></script>
 <script>
     document.addEventListener("DOMContentLoaded", () => {
         // URL 쿼리에서 token 추출
@@ -149,20 +154,9 @@ <h2 class="mt-6 text-2xl font-bold text-gray-900">비밀번호 재설정</h2>
             };
 
             try {
-                const response = await fetch(memberUrl + "/reset/password", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify(requestDto)
-                });
-
-                const result = await response.json();
-
-                if (response.ok && result.isSuccess) {
-                    alert("비밀번호가 성공적으로 변경되었습니다. 다시 로그인해주세요.");
-                    window.location.href = "/member/login";
-                } else {
-                    alert(result.message || "비밀번호 변경 중 오류가 발생했습니다.");
-                }
+                await api.postJson(`${memberUrl}/reset/password`, requestDto);
+                alert("비밀번호가 성공적으로 변경되었습니다. 다시 로그인해주세요.");
+                window.location.href = "/member/login";
             } catch (error) {
                 console.error("🚨 서버 오류:", error);
                 alert("서버와 통신 중 문제가 발생했습니다.");
diff --git a/src/main/resources/templates/homepage/user/school/introTemplate.html b/src/main/resources/templates/homepage/user/school/introTemplate.html
index 176c8c0..873cc84 100644
--- a/src/main/resources/templates/homepage/user/school/introTemplate.html
+++ b/src/main/resources/templates/homepage/user/school/introTemplate.html
@@ -1012,7 +1012,7 @@ <h3 class="text-lg font-semibold mb-4">팔로우</h3>
         });
     });
 </script>
-<script src="/js/homepage/login.js"></script>
-<script src="/js/homepage/nav-user.js"></script>
+<script src="/js/homepage/common/login.js"></script>
+<script src="/js/homepage/common/nav-user.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/homepage/user/signup.html b/src/main/resources/templates/homepage/user/signup.html
index c45858e..c995b83 100644
--- a/src/main/resources/templates/homepage/user/signup.html
+++ b/src/main/resources/templates/homepage/user/signup.html
@@ -108,7 +108,7 @@ <h1 class="text-3xl font-bold text-gray-800">유학원 회원가입</h1>
                 <h2
                         class="text-xl font-semibold text-gray-800 mb-4 pb-2 border-b border-gray-200"
                 >
-                    대표자 정보
+                    사용자 정보
                 </h2>
                 <div class="space-y-5">
                     <!-- 대표자 이름 -->
@@ -116,7 +116,7 @@ <h1 class="text-3xl font-bold text-gray-800">유학원 회원가입</h1>
                         <label
                                 for="name"
                                 class="block text-sm font-medium text-gray-700 mb-1"
-                        >대표자 이름 <span class="text-red-500">*</span></label
+                        >사용자 이름 <span class="text-red-500">*</span></label
                         >
                         <input
                                 type="text"
@@ -237,7 +237,7 @@ <h1 class="text-3xl font-bold text-gray-800">유학원 회원가입</h1>
                         <label
                                 for="telNum"
                                 class="block text-sm font-medium text-gray-700 mb-1"
-                        >대표자 전화번호 <span class="text-red-500">*</span></label
+                        >사용자 전화번호 <span class="text-red-500">*</span></label
                         >
                         <input
                                 type="tel"
@@ -256,7 +256,7 @@ <h1 class="text-3xl font-bold text-gray-800">유학원 회원가입</h1>
                         <label
                                 for="mobile"
                                 class="block text-sm font-medium text-gray-700 mb-1"
-                        >대표자 휴대폰 번호 <span class="text-red-500">*</span></label
+                        >사용자 휴대폰 번호 <span class="text-red-500">*</span></label
                         >
                         <input
                                 type="tel"
@@ -275,7 +275,7 @@ <h1 class="text-3xl font-bold text-gray-800">유학원 회원가입</h1>
                         <label
                                 for="address"
                                 class="block text-sm font-medium text-gray-700 mb-1"
-                        >대표자 주소 <span class="text-red-500">*</span></label
+                        >사용자 주소 <span class="text-red-500">*</span></label
                         >
                         <div class="flex gap-3 mb-2">
                             <input
@@ -761,6 +761,11 @@ <h4 class="font-semibold text-gray-700">주소 검색</h4>
     <div id="postcode-wrap" class="w-full h-[400px]"></div>
 </div>
 
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
 
 <script id="passwordToggleScript">
     document.addEventListener("DOMContentLoaded", function () {
@@ -1125,30 +1130,30 @@ <h4 class="font-semibold text-gray-700">주소 검색</h4>
                 }
                 // 여기서는 실제 API 호출 대신 시뮬레이션
                 setTimeout(() => {
-                    fetch(`${memberUrl}/check-id?username=${encodeURIComponent(username)}`)
-                        .then(response => {
-                            if (!response.ok) {
-                                throw new Error("서버 응답 오류");
-                            }
-                            return response.json();  // true 또는 false
-                        })
-                        .then( data => {
-                            const isDuplicate = data.result;
-                            console.log(isDuplicate);
-                            if (isDuplicate) {
-                                usernameStatus.textContent = "이미 사용 중인 아이디입니다.";
-                                usernameStatus.className = "mt-1 text-sm text-red-600";
-                            } else {
-                                usernameStatus.textContent = "사용 가능한 아이디입니다.";
-                                isUsernameChecked = true;
-                                usernameStatus.className = "mt-1 text-sm text-green-600";
-                            }
-                        })
-                        .catch(error => {
-                            console.error("중복 확인 중 오류:", error);
-                            usernameStatus.textContent = "중복 확인에 실패했습니다.";
-                            usernameStatus.className = "mt-1 text-sm text-gray-500";
-                        });
+                    (async () => {
+                            try {
+                                  const data = await api.get(
+                                        `${memberUrl}/check-id?username=${encodeURIComponent(username)}`
+                                      ); // BaseURL 이미 설정된 가정
+                                  // 서버가 {isSuccess:true,result:boolean} 또는 boolean 둘 다 대응
+                                      const isDuplicate =
+                                        data && typeof data === "object" && "result" in data ? data.result : !!data;
+
+                                      console.log(isDuplicate);
+                                  if (isDuplicate) {
+                                        usernameStatus.textContent = "이미 사용 중인 아이디입니다.";
+                                        usernameStatus.className = "mt-1 text-sm text-red-600";
+                                      } else {
+                                        usernameStatus.textContent = "사용 가능한 아이디입니다.";
+                                        isUsernameChecked = true;
+                                        usernameStatus.className = "mt-1 text-sm text-green-600";
+                                      }
+                                } catch (error) {
+                                  console.error("중복 확인 중 오류:", error);
+                                  usernameStatus.textContent = "중복 확인에 실패했습니다.";
+                                  usernameStatus.className = "mt-1 text-sm text-gray-500";
+                                }
+                          })();
                 }, 100);
             });
 
@@ -1241,18 +1246,6 @@ <h3 class="text-lg font-medium text-gray-900 mb-4">알림</h3>
                     //데이터 수집
                     const formData = new FormData();
                     formData.append('data',JSON.stringify(jsonData));
-                    // formData.append('memberName', form.name.value);
-                    // formData.append('email', form.email.value);
-                    // formData.append('password', form.password.value);
-                    // formData.append('homePhoneNumber', form.telNum.value);
-                    // formData.append('phoneNumber', form.mobile.value)
-                    // formData.append('address1', form.address1.value);
-                    // formData.append('address2', form.address2.value);
-                    // formData.append('agencyName', form.agencyName.value);
-                    // formData.append('agencyAddress1', form.agencyAddress1.value);
-                    // formData.append('agencyAddress2', form.agencyAddress2.value);
-
-
                     // 파일 업로드
                     const agencyImage = form.agencyImage.files[0];
                     if (agencyImage) formData.append('agencyPicture', agencyImage);
@@ -1270,23 +1263,14 @@ <h3 class="text-lg font-medium text-gray-900 mb-4">알림</h3>
                     console.log("파일 선택 여부:", form.businessLicense.files[0]);
 
 
-                    const response = await fetch(form.action, {
-                        method: "POST",
-                        body: formData,
-                    });
-
-                    console.log("🔍 response 객체:", response);
-
-// 개별 정보 출력
-                    console.log("✅ 상태 코드:", response.status);       // ex: 200, 500
-                    console.log("✅ 성공 여부:", response.ok);           // true/false
-                    console.log("✅ 상태 메시지:", response.statusText); // ex: OK, Internal Server Error
+                    console.log("🔍 요청 시작: POST", form.action);
+                    await api.postMultipart(form.action, formData);
+                    console.log("✅ 가입 요청 성공");
 
-                    if (response.ok) {
-                        const modal = document.createElement("div");
-                        modal.className =
+                    const modal = document.createElement("div");
+                    modal.className =
                             "fixed inset-0 flex items-center justify-center z-50";
-                        modal.innerHTML = `
+                    modal.innerHTML = `
       <div class="fixed inset-0 bg-black opacity-50"></div>
       <div class="bg-white rounded-lg p-6 relative z-10 max-w-sm w-full mx-4">
       <div class="flex items-center justify-center mb-4">
@@ -1302,9 +1286,6 @@ <h3 class="text-lg font-medium text-gray-900 text-center mb-2">회원가입 완
                             modal.remove();
                             window.location.href = "/member/login";
                         };
-                    } else {
-                        throw new Error("서버 오류가 발생했습니다.");
-                    }
                 } catch (error) {
                     const modal = document.createElement("div");
                     modal.className = "fixed inset-0 flex items-center justify-center z-50";
@@ -1405,8 +1386,7 @@ <h4 class="text-lg font-semibold text-gray-700">중국 주소 검색</h4>
         async function fetchSuggestions(keyword) {
             const url = `/api/v1/tencent/address?keyword=${encodeURIComponent(keyword)}`;
             try {
-                const resp = await fetch(url);
-                const data = await resp.json();
+                const data = await api.get(url);
                 console.log("Tencent API result:", data);
 
                 if (!data || !data.data || data.data.length === 0) {
@@ -1459,6 +1439,6 @@ <h4 class="text-lg font-semibold text-gray-700">중국 주소 검색</h4>
         }
     });
 </script>
-<script src="/js/homepage/url.js"></script>
+<script src="/js/homepage/common/url.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/homepage/user/survey/copy-survey-list-admin.html b/src/main/resources/templates/homepage/user/survey/copy-survey-list-admin.html
index fc71869..922893c 100644
--- a/src/main/resources/templates/homepage/user/survey/copy-survey-list-admin.html
+++ b/src/main/resources/templates/homepage/user/survey/copy-survey-list-admin.html
@@ -383,6 +383,13 @@ <h1 class="text-2xl font-bold">설문조사 목록</h1>
         </nav>
     </div>
 </main>
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    api.setBaseURL("/api/v1");
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+
 <script id="delete-modal-management">
     document.addEventListener("DOMContentLoaded", function () {
         const deleteModal = document.getElementById("delete-confirm-modal");
@@ -415,30 +422,22 @@ <h1 class="text-2xl font-bold">설문조사 목록</h1>
             });
 
         cancelDeleteBtn.addEventListener("click", closeDeleteModal);
-        confirmDeleteBtn.addEventListener("click", function () {
+        confirmDeleteBtn.addEventListener("click", async function () {
             console.log(surveyToDelete);
             if (surveyToDelete) {
                 const surveyId = surveyToDelete.dataset.surveyId;
                 console.log(surveyId);
-                if(surveyId){
+                if (surveyId) {
                     console.log("fetch하기전");
-                    fetch(`/api/v1/survey/${surveyId}`, {
-                        method: "DELETE"
-                    })
-                        .then(response => {
-                            if (response.ok) {
-                                surveyToDelete.remove();  // 화면에서 제거
-                                closeDeleteModal();       // 모달 닫기
-                                alert("삭제되었습니다.");
-                            } else {
-                                closeDeleteModal();
-                                alert("삭제 실패");
-                            }
-                        })
-                        .catch(error => {
-                            console.error("삭제 중 오류:", error);
-                            alert("서버 오류로 삭제에 실패했습니다.");
-                        });
+                    try{
+                        await api.delete(`/survey/${surveyId}`);
+                        surveyToDelete.remove();
+                        closeDeleteModal();
+                        alert("삭제되었습니다.");
+                    }catch(e){
+                        console.error("삭제 중 오류:", e);
+                        closeDeleteModal();
+                    }
                 }
             }
         });
@@ -482,31 +481,24 @@ <h1 class="text-2xl font-bold">설문조사 목록</h1>
         });
 
         cancelCopyBtn.addEventListener("click", closeCopyModal);
-        confirmCopyBtn.addEventListener("click", function () {
+        confirmCopyBtn.addEventListener("click", async function () {
             console.log(surveyToCopy);
             if (surveyToCopy) {
                 const surveyId = surveyToCopy.dataset.surveyId;
                 console.log(surveyId);
-                if(surveyId){
+                if (surveyId) {
                     console.log("fetch하기전");
-                    fetch(`/api/v1/survey/copy/${surveyId}`, {
-                        method: "POST"
-                    })
-                        .then(response => {
-                            if (response.ok) {
-                                surveyToCopy.remove();  // 화면에서 제거
-                                closeCopyModal();       // 모달 닫기
-                                alert("복사되었습니다.");
-                                location.reload();
-                            } else {
-                                closeCopyModal();
-                                alert("복사 실패");
-                            }
-                        })
-                        .catch(error => {
-                            console.error("복사 중 오류:", error);
-                            alert("서버 오류로 복사에 실패했습니다.");
-                        });
+
+                    try{
+                        await api._request("POST", `/survey/copy/${surveyId}`, null, {});
+                        surveyToCopy.remove();  // 화면에서 제거
+                        closeCopyModal();       // 모달 닫기
+                        alert("복사되었습니다.");
+                        location.reload();
+                    }catch(e){
+                        console.error("복사 중 오류:", e);
+                        closeCopyModal();
+                    }
                 }
             }
         });
@@ -603,36 +595,35 @@ <h1 class="text-2xl font-bold">설문조사 목록</h1>
     });
 </script>
 <script>
-    document.addEventListener("DOMContentLoaded", function () {
+    document.addEventListener("DOMContentLoaded", async function () {
         const container = document.getElementById("survey-list-container");
 
-        fetch("/api/v1/survey/getAll") // ←  리스트 반환하는 API 엔드포인트
-            .then((res) => res.json())
-            .then((data) => {
-                if (!Array.isArray(data)) {
-                    throw new Error("Invalid response format");
-                }
+        try {
+            const data = await api.get("/survey/getAll"); // baseURL이 /api/v1 이므로 최종 /api/v1/survey/getAll
+            if (!Array.isArray(data)) {
+                throw new Error("Invalid response format");
+            }
 
-                container.innerHTML = "";
+            container.innerHTML = "";
 
-                data.forEach((survey) => {
-                    const card = document.createElement("div");
-                    card.className = "survey-card bg-white rounded-lg shadow-sm overflow-hidden";
+            data.forEach((survey) => {
+                const card = document.createElement("div");
+                card.className = "survey-card bg-white rounded-lg shadow-sm overflow-hidden";
 
-                    const surveyId = survey.surveyId;
-                    card.dataset.surveyId = surveyId;
-                    const createdDate = new Date(survey.createdAt);
-                    const formattedDate = createdDate.toLocaleDateString("ko-KR", {
-                        year: "numeric", month: "long", day: "numeric"
-                    });
-                    const isBefore = survey.isBefore;
-                    const status = isBefore ? "진행 전" : (survey.lastDate > 0 ? "진행 중" : "종료");
+                const surveyId = survey.surveyId;
+                card.dataset.surveyId = surveyId;
+                const createdDate = new Date(survey.createdAt);
+                const formattedDate = createdDate.toLocaleDateString("ko-KR", {
+                    year: "numeric", month: "long", day: "numeric"
+                });
+                const isBefore = survey.isBefore;
+                const status = isBefore ? "진행 전" : (survey.lastDate > 0 ? "진행 중" : "종료");
 
-                    const badgeClass = isBefore ? "bg-blue-100 text-white-800" : (survey.lastDate > 0
-                        ? "bg-green-100 text-green-800"
-                        : "bg-red-100 text-red-800");
+                const badgeClass = isBefore ? "bg-blue-100 text-white-800" : (survey.lastDate > 0
+                    ? "bg-green-100 text-green-800"
+                    : "bg-red-100 text-red-800");
 
-                    card.innerHTML = `
+                card.innerHTML = `
                         <div class="p-6">
                             <div class="flex items-start justify-between mb-3">
                                 <h3 class="text-lg font-bold text-gray-900 line-clamp-2">
@@ -653,10 +644,10 @@ <h3 class="text-lg font-bold text-gray-900 line-clamp-2">
                                     <i class="ri-time-line mr-2"></i>
                                     <span>
                                       ${survey.isBefore
-                                                            ? "시작 안함"
-                                                            : (survey.lastDate > 0
-                                                                ? `남은 기간: ${survey.lastDate}일`
-                                                                : "종료일 지남")}
+                    ? "시작 안함"
+                    : (survey.lastDate > 0
+                        ? `남은 기간: ${survey.lastDate}일`
+                        : "종료일 지남")}
                                     </span>
                                 </div>
                             </div>
@@ -719,13 +710,12 @@ <h3 class="text-lg font-bold text-gray-900 line-clamp-2">
                         </div>
                 `;
 
-                    container.appendChild(card);
-                });
-            })
-            .catch((err) => {
-                console.error("설문조사 불러오기 실패:", err);
-                container.innerHTML = "<p class='text-gray-500'>설문조사를 불러오는 데 실패했습니다.</p>";
+                container.appendChild(card);
             });
+        } catch (err) {
+            console.error("설문조사 불러오기 실패:", err);
+            container.innerHTML = "<p class='text-gray-500'>설문조사를 불러오는 데 실패했습니다.</p>";
+        }
     });
 </script>
 <script>
diff --git a/src/main/resources/templates/homepage/user/survey/survey-answer-detail.html b/src/main/resources/templates/homepage/user/survey/survey-answer-detail.html
index 263de15..e59ef43 100644
--- a/src/main/resources/templates/homepage/user/survey/survey-answer-detail.html
+++ b/src/main/resources/templates/homepage/user/survey/survey-answer-detail.html
@@ -4,8 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>응답자 상세 정보</title>
-    <script src="https://cdn.tailwindcss.com/3.4.16">
-    </script>
+    <script src="https://cdn.tailwindcss.com/3.4.16"></script>
     <script>
         tailwind.config = {
             theme: {
@@ -31,8 +30,7 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Pacifico&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/remixicon/4.6.0/remixicon.min.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/5.5.0/echarts.min.js">
-    </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/5.5.0/echarts.min.js"></script>
     <style>
         :where([class^="ri-"])::before { content: "\f3c2"; }
         body {
@@ -49,61 +47,53 @@
             background-color: white;
             transition: all 0.2s ease;
         }
-        .custom-radio.checked {
-            border-color: #4f46e5;
-        }
+        .custom-radio.checked { border-color: #4f46e5; }
         .custom-radio.checked::after {
             content: '';
             position: absolute;
-            left: 3px;
-            top: 3px;
-            width: 8px;
-            height: 8px;
+            left: 3px; top: 3px;
+            width: 8px; height: 8px;
             border-radius: 50%;
             background-color: #4f46e5;
         }
         .custom-range {
             -webkit-appearance: none;
-            width: 100%;
-            height: 6px;
-            border-radius: 3px;
-            background: #e5e7eb;
+            width: 100%; height: 6px;
+            border-radius: 3px; background: #e5e7eb;
             outline: none;
         }
         .custom-range::-webkit-slider-thumb {
-            -webkit-appearance: none;
-            appearance: none;
-            width: 18px;
-            height: 18px;
-            border-radius: 50%;
-            background: #4f46e5;
-            cursor: pointer;
-            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+            -webkit-appearance: none; appearance: none;
+            width: 18px; height: 18px; border-radius: 50%;
+            background: #4f46e5; cursor: pointer;
+            box-shadow: 0 2px 4px rgba(0,0,0,.1);
         }
         .custom-range::-moz-range-thumb {
-            width: 18px;
-            height: 18px;
-            border-radius: 50%;
-            background: #4f46e5;
-            cursor: pointer;
-            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-            border: none;
+            width: 18px; height: 18px; border-radius: 50%;
+            background: #4f46e5; cursor: pointer;
+            box-shadow: 0 2px 4px rgba(0,0,0,.1); border: none;
         }
+        /* 추가: 응답 박스/칩/빈 값 표시 */
+        .answer-box { background: #f9fafb; border-radius: 12px; padding: 16px; font-size: 14px; color: #1f2937; }
+        .empty-box { background: #fff7ed; color: #9a3412; border: 1px solid #fed7aa; }
+        .kv { display: grid; grid-template-columns: 88px 1fr; gap: 8px 12px; font-size: 14px; }
+        .q-chip { display: inline-flex; align-items: center; gap: 6px; border: 1px solid #e5e7eb; border-radius: 9999px; padding: 4px 10px; font-size: 12px; }
     </style>
 </head>
 <body class="min-h-screen">
+
 <!-- 헤더 -->
 <header class="bg-white shadow">
     <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
-        <div class="flex items-center justify-between">
+        <div class="flex items-center justify-between whitespace-nowrap w-full">
             <div th:if="${isAdmin}" class="flex items-center gap-4">
                 <a th:href="@{'/survey/log/list/'+${answerLog.surveyId}}" class="flex items-center gap-2 text-gray-600 hover:text-gray-900">
                     <i class="ri-arrow-left-line"></i>
                     <span>응답 목록으로 돌아가기</span>
                 </a>
             </div>
-            <div class="flex items-center gap-4">
-                <div class="text-sm text-gray-500" th:text="${answerLog.logDto.submitTime}" >2025년 7월 1일 화요일</div>
+            <div class="flex items-center gap-4 ml-auto shrink-0">
+                <div class="text-sm text-gray-500" th:text="${answerLog.logDto.submitTime}">2025년 7월 1일 화요일</div>
                 <div class="w-10 h-10 rounded-full bg-gray-200 flex items-center justify-center">
                     <i class="ri-user-line text-gray-600"></i>
                 </div>
@@ -111,25 +101,20 @@
         </div>
     </div>
 </header>
+
 <!-- 메인 콘텐츠 -->
 <main class="flex-grow">
     <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
+
         <!-- 응답자 기본 정보 -->
         <div class="bg-white rounded-lg shadow p-6 mb-6">
             <div class="flex flex-col md:flex-row justify-between gap-6">
                 <div>
-                    <h1 class="text-2xl font-bold text-gray-900" th:text="${answerLog.surveyTitle}" >고객 만족도 조사 2025</h1>
+                    <h1 class="text-2xl font-bold text-gray-900" th:text="${answerLog.surveyTitle}">고객 만족도 조사 2025</h1>
                     <p class="text-sm text-gray-500 mt-1" th:text="${answerLog.surveyStartDate}+' ~ '+${answerLog.surveyEndDate}">2025.06.20 - 2025.07.01</p>
                 </div>
                 <div class="flex flex-wrap gap-3">
-                    <button class="flex items-center gap-2 px-4 py-2 border border-gray-300 rounded-button text-gray-700 hover:bg-gray-50 whitespace-nowrap">
-                        <i class="ri-file-excel-line"></i>
-                        <span>Excel 내보내기</span>
-                    </button>
-                    <button class="flex items-center gap-2 px-4 py-2 border border-gray-300 rounded-button text-gray-700 hover:bg-gray-50 whitespace-nowrap">
-                        <i class="ri-printer-line"></i>
-                        <span>인쇄</span>
-                    </button>
+                    <!-- 내보내기/인쇄 버튼 필요시 복구 -->
                 </div>
             </div>
             <div class="mt-6 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
@@ -154,18 +139,66 @@ <h1 class="text-2xl font-bold text-gray-900" th:text="${answerLog.surveyTitle}"
                 </div>
             </div>
         </div>
+
+        <!-- 응답 내용 -->
         <div class="space-y-6">
-            <!-- 응답 내용 -->
             <div class="bg-white rounded-lg shadow p-6">
                 <h2 class="text-lg font-medium text-gray-900 mb-6">응답 내용</h2>
+
+                <!-- ✅ 여기 루프 안에서만 an/questionId 사용 -->
                 <div class="space-y-8" th:each="an, iterStat : ${answerLog.answer}">
                     <div class="space-y-4">
-                        <h3 class="text-base font-medium text-gray-900" th:text="'Q' + ${an.questionId} + '. ' + ${answerLog.questions[an.questionId - 1].question}"></h3>
 
-                        <!-- SHORT, PARAGRAPH, ESSAY -->
-                        <div th:if="${answerLog.questions[an.questionId - 1].type == 'SHORT' or  answerLog.questions[an.questionId - 1].type == 'ESSAY'}">
-                            <div class="bg-gray-50 p-4 rounded-lg">
-                                <p class="text-sm text-gray-700" th:text="${an.answer}">답변</p>
+                        <!-- 질문 헤더 + 타입 뱃지 -->
+                        <div class="flex items-start justify-between gap-3">
+                            <h3 class="text-base font-semibold text-gray-900"
+                                th:text="'Q' + ${an.questionId} + '. ' + ${answerLog.questions[an.questionId - 1].question}">
+                                질문 내용
+                            </h3>
+                            <div class="flex items-center gap-2">
+                                <span class="q-chip bg-indigo-50 text-indigo-700 border-indigo-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='SHORT'}">
+                                    <i class="ri-input-cursor-move"></i> SHORT
+                                </span>
+                                <span class="q-chip bg-indigo-50 text-indigo-700 border-indigo-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='ESSAY'}">
+                                    <i class="ri-article-line"></i> ESSAY
+                                </span>
+                                <span class="q-chip bg-sky-50 text-sky-700 border-sky-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='MULTIPLE'}">
+                                    <i class="ri-radio-button-line"></i> 객관식
+                                </span>
+                                <span class="q-chip bg-emerald-50 text-emerald-700 border-emerald-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='multiple-checkbox'}">
+                                    <i class="ri-checkbox-multiple-line"></i> 체크박스
+                                </span>
+                                <span class="q-chip bg-violet-50 text-violet-700 border-violet-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='DROPDOWN'}">
+                                    <i class="ri-arrow-down-s-line"></i> 드롭다운
+                                </span>
+                                <span class="q-chip bg-amber-50 text-amber-700 border-amber-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='DATE'}">
+                                    <i class="ri-calendar-line"></i> 날짜
+                                </span>
+                                <span class="q-chip bg-rose-50 text-rose-700 border-rose-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='FILE'}">
+                                    <i class="ri-file-3-line"></i> 파일
+                                </span>
+                                <span class="q-chip bg-pink-50 text-pink-700 border-pink-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='IMAGE'}">
+                                    <i class="ri-image-line"></i> 이미지
+                                </span>
+                                <span class="q-chip bg-fuchsia-50 text-fuchsia-700 border-fuchsia-200"
+                                      th:if="${answerLog.questions[an.questionId - 1].type=='hierarchy'}">
+                                    <i class="ri-mind-map"></i> 계층형
+                                </span>
+                            </div>
+                        </div>
+
+                        <!-- SHORT / ESSAY -->
+                        <div th:if="${answerLog.questions[an.questionId - 1].type == 'SHORT' or answerLog.questions[an.questionId - 1].type == 'ESSAY'}">
+                            <div class="answer-box" th:classappend="${#strings.isEmpty(an.answer)} ? ' empty-box' : ''">
+                                <p th:text="${#strings.isEmpty(an.answer) ? '미응답' : an.answer}">답변</p>
                             </div>
                         </div>
 
@@ -181,103 +214,117 @@ <h3 class="text-base font-medium text-gray-900" th:text="'Q' + ${an.questionId}
                             </div>
                         </div>
 
-                        <!-- MULTIPLECHECK -->
+                        <!-- multiple-checkbox (선택 칩/체크 표시) -->
                         <div th:if="${answerLog.questions[an.questionId - 1].type == 'multiple-checkbox'}" class="space-y-3">
                             <label th:each="opt, stat : ${answerLog.questions[an.questionId - 1].options}" class="custom-checkbox flex items-center">
-                                <!-- 박스 스타일 -->
                                 <span class="w-5 h-5 border-2 rounded flex items-center justify-center mr-3 relative"
                                       th:with="selectedVals=${(an.answer ?: '').split(',')}"
                                       th:style="${#arrays.contains(selectedVals, stat.index.toString())}
                                           ? 'background-color: rgb(79, 70, 229); border-color: rgb(79, 70, 229);'
                                           : 'background-color: white; border-color: #d1d5db;'">
-
-                                    <!-- 체크 아이콘 -->
                                     <span class="absolute text-white"
                                           th:style="${#arrays.contains(selectedVals, stat.index.toString())} ? 'opacity: 1;' : 'opacity: 0;'">
                                         <i class="ri-check-line text-xs"></i>
                                     </span>
                                 </span>
-                                <!-- 텍스트 -->
                                 <span class="text-gray-700" th:text="${opt.text}">옵션</span>
                             </label>
+                            <div class="answer-box empty-box mt-2"
+                                 th:if="${#strings.isEmpty(an.answer)}">미응답</div>
                         </div>
 
-
                         <!-- DROPDOWN -->
                         <div th:if="${answerLog.questions[an.questionId - 1].type == 'DROPDOWN'}">
-                            <div class="bg-gray-50 p-4 rounded-lg">
-                                <p class="text-sm text-gray-700" th:text="${an.answer}">선택된 항목</p>
+                            <div class="answer-box" th:classappend="${#strings.isEmpty(an.answer)} ? ' empty-box' : ''">
+                                <div class="kv">
+                                    <div class="text-gray-500">선택</div>
+                                    <div th:text="${#strings.isEmpty(an.answer) ? '미응답' : an.answer}">선택된 항목</div>
+                                </div>
                             </div>
                         </div>
 
                         <!-- DATE -->
                         <div th:if="${answerLog.questions[an.questionId - 1].type == 'DATE'}">
-                            <div class="bg-gray-50 p-4 rounded-lg">
-                                <p class="text-sm text-gray-700" th:text="${an.answer}">날짜</p>
+                            <div class="answer-box" th:classappend="${#strings.isEmpty(an.answer)} ? ' empty-box' : ''">
+                                <i class="ri-calendar-line mr-2"></i>
+                                <span th:text="${#strings.isEmpty(an.answer) ? '미응답' : an.answer}">날짜</span>
                             </div>
                         </div>
 
-                        <!-- FILE -->
+                        <!-- FILE (프리뷰 버튼) -->
                         <div th:if="${answerLog.questions[an.questionId - 1].type == 'FILE'}">
-                            <div class="bg-gray-50 p-4 rounded-lg uploaded-pdf"
-                                 th:attr="data-fullname=${an.answer}">
+                            <div class="answer-box flex items-center justify-between">
+                                <div class="flex items-center gap-3 min-w-0">
+                                    <i class="ri-file-3-line text-gray-500"></i>
+                                    <div class="truncate" th:text="${#strings.isEmpty(an.answer) ? '미응답' : an.answer}">파일명.ext</div>
+                                </div>
+                                <button type="button"
+                                        class="text-sm font-medium text-indigo-700 hover:underline"
+                                        th:if="${!#strings.isEmpty(an.answer)}"
+                                        th:attr="data-fullname=${an.answer}">
+                                    보기
+                                </button>
                             </div>
+                            <!-- 실제 PDF 프리뷰 박스는 .uploaded-pdf에서 JS로 렌더 -->
+                            <div class="bg-gray-50 p-4 rounded-lg uploaded-pdf mt-2"
+                                 th:attr="data-fullname=${an.answer}"></div>
                         </div>
 
+                        <!-- IMAGE (썸네일 프리뷰) -->
                         <div th:if="${answerLog.questions[an.questionId - 1].type == 'IMAGE'}">
-                            <div class="bg-gray-50 p-4 rounded-lg uploaded-image"
-                                 th:attr="data-fullname=${an.answer}">
+                            <div class="answer-box">
+                                <div th:if="${#strings.isEmpty(an.answer)}" class="empty-box p-3 rounded-lg">미응답</div>
+                                <div class="uploaded-image mt-2" th:if="${!#strings.isEmpty(an.answer)}"
+                                     th:attr="data-fullname=${an.answer}"></div>
                             </div>
                         </div>
 
-<!--                        Hierarchy-->
-                        <div th:if="${answerLog.questions[an.questionId - 1].type == 'hierarchy'}" class="text-gray-700">
-                            <span th:with="hierarchyList=${(an.answer ?: '').split(',')}">
-                                <span th:each="item, iterStat : ${hierarchyList}">
-                                    <span th:text="${item}"></span>
-                                    <span th:if="${!iterStat.last}"> &gt; </span> <!-- > 기호 -->
-                                </span>
-                            </span>
+                        <!-- hierarchy (브레드크럼) -->
+                        <div th:if="${answerLog.questions[an.questionId - 1].type == 'hierarchy'}" class="answer-box">
+                            <th:block th:with="
+      hierarchyArr=${(an.answer != null ? an.answer : '').split(',')},
+      hierarchyLen=${#arrays.length(hierarchyArr)}
+  ">
+                                <!-- 비어 있음 -->
+                                <div th:if="${hierarchyLen == 0 or (hierarchyLen == 1 and hierarchyArr[0] == '')}"
+                                     class="empty-box p-3 rounded-lg">미응답</div>
+
+                                <!-- 값 표시 (브레드크럼) -->
+                                <nav class="text-sm text-gray-800"
+                                     th:if="${!(hierarchyLen == 0 or (hierarchyLen == 1 and hierarchyArr[0] == ''))}">
+                                    <ol class="flex flex-wrap items-center gap-1">
+                                        <li th:each="item, s : ${hierarchyArr}" class="flex items-center gap-1">
+                                            <span th:text="${item}">항목</span>
+                                            <i class="ri-arrow-right-s-line text-gray-400" th:if="${!s.last}"></i>
+                                        </li>
+                                    </ol>
+                                </nav>
+                            </th:block>
                         </div>
                     </div>
                 </div>
-
             </div>
         </div>
+
     </div>
-    <!-- 하단 네비게이션 -->
-<!--    <div class="mt-6 flex justify-between items-center bg-white rounded-lg shadow p-4">-->
-<!--        <button class="flex items-center gap-2 px-4 py-2 border border-gray-300 rounded-button text-gray-700 hover:bg-gray-50 whitespace-nowrap">-->
-<!--            <i class="ri-arrow-left-line"></i>-->
-<!--            <span>이전 응답자</span>-->
-<!--        </button>-->
-<!--        <div class="text-sm text-gray-500">-->
-<!--            42명 중 15번째-->
-<!--        </div>-->
-<!--        <button class="flex items-center gap-2 px-4 py-2 border border-gray-300 rounded-button text-gray-700 hover:bg-gray-50 whitespace-nowrap">-->
-<!--            <span>다음 응답자</span>-->
-<!--            <i class="ri-arrow-right-line"></i>-->
-<!--        </button>-->
-<!--    </div>-->
 </main>
-<script src="/js/homepage/url.js"></script>
+
+<script src="/js/homepage/common/url.js"></script>
 <script>
     function parseUuidAndFilename(fullName) {
         const underscoreIndex = fullName.indexOf('_');
-        if (underscoreIndex === -1) {
-            return { uuid: fullName, filename: '' };
-        }
-
+        if (underscoreIndex === -1) return { uuid: fullName, filename: '' };
         const uuid = fullName.substring(0, underscoreIndex);
         const filename = fullName.substring(underscoreIndex + 1);
         return { uuid, filename };
     }
 
+    // PDF 미리보기
     document.querySelectorAll('.uploaded-pdf').forEach(div => {
-        const fullName = div.dataset.fullname;
+        const fullName = div.dataset.fullname || '';
+        if (!fullName) { div.remove(); return; }
         const { uuid, filename } = parseUuidAndFilename(fullName);
 
-        // PDF 미리보기 블록
         const container = document.createElement("div");
         container.className = "flex flex-col items-center justify-center text-gray-500 border border-gray-200 rounded-lg p-4 bg-gray-50";
 
@@ -292,16 +339,16 @@ <h3 class="text-base font-medium text-gray-900" th:text="'Q' + ${an.questionId}
 
         container.appendChild(icon);
         container.appendChild(link);
-
-        div.innerHTML = ""; // 기존 내용 제거
+        div.innerHTML = "";
         div.appendChild(container);
     });
 
+    // 이미지 미리보기
     document.querySelectorAll('.uploaded-image').forEach(div => {
-        const fullName = div.dataset.fullname;
+        const fullName = div.dataset.fullname || '';
+        if (!fullName) { div.remove(); return; }
         const { uuid, filename } = parseUuidAndFilename(fullName);
 
-        // 이미지 미리보기
         const container = document.createElement("div");
         container.className = "border border-gray-200 rounded-lg overflow-hidden bg-gray-50 flex items-center justify-center aspect-[4/3]";
 
@@ -316,4 +363,4 @@ <h3 class="text-base font-medium text-gray-900" th:text="'Q' + ${an.questionId}
     });
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/homepage/user/survey/survey-answer-log.html b/src/main/resources/templates/homepage/user/survey/survey-answer-log.html
index ec0a041..81b4295 100644
--- a/src/main/resources/templates/homepage/user/survey/survey-answer-log.html
+++ b/src/main/resources/templates/homepage/user/survey/survey-answer-log.html
@@ -1094,7 +1094,14 @@ <h5 class="text-xs text-gray-500 mb-2">
         </div>
     </main>
 </div>
-<script src="/js/homepage/url.js"></script>
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+
+
+<script src="/js/homepage/common/url.js"></script>
 <script id="checkbox-handler">
     document.addEventListener("DOMContentLoaded", function () {
         // 체크박스 기능 구현
@@ -1178,17 +1185,8 @@ <h5 class="text-xs text-gray-500 mb-2">
             };
 
             try {
-                const response = await fetch(`${surveyAdminUrl}/log/csv`, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify(requestDto),
-                });
 
-                if (!response.ok) {
-                    throw new Error('CSV 생성에 실패했습니다.');
-                }
+                const csvText = await api.postJson(`${surveyAdminUrl}/log/csv`, requestDto);
                 const titleText = document.getElementById("survey-title").textContent;
                 const today = new Date();
                 const year = today.getFullYear();
@@ -1197,7 +1195,7 @@ <h5 class="text-xs text-gray-500 mb-2">
 
                 const todayStr = `${year}-${month}-${day}`;
 
-                const blob = await response.blob();
+                const blob = new Blob([csvText], { type: 'text/csv;charset=utf-8' });
                 const url = window.URL.createObjectURL(blob);
                 const a = document.createElement('a');
                 a.href = url;
@@ -1248,13 +1246,7 @@ <h5 class="text-xs text-gray-500 mb-2">
             const surveyId = document.getElementById("survey-title").dataset.id;
 
             try {
-                const response = await fetch(`${surveyAdminUrl}/log/${surveyId}`, {
-                    method: 'POST',
-                });
-
-                if (!response.ok) {
-                    throw new Error('CSV 생성에 실패했습니다.');
-                }
+                const csvData = await api._request("POST", `${surveyAdminUrl}/log/${surveyId}`, null, {});
                 const titleText = document.getElementById("survey-title").textContent;
                 const today = new Date();
                 const year = today.getFullYear();
@@ -1263,7 +1255,10 @@ <h5 class="text-xs text-gray-500 mb-2">
 
                 const todayStr = `${year}-${month}-${day}`;
 
-                const blob = await response.blob();
+                const blob = csvData instanceof Response
+                    ? await csvData.blob()
+                      : new Blob([csvData], { type: "text/csv;charset=utf-8" });
+
                 const url = window.URL.createObjectURL(blob);
                 const a = document.createElement('a');
 
@@ -1315,13 +1310,8 @@ <h5 class="text-xs text-gray-500 mb-2">
             const surveyId = document.getElementById("survey-title").dataset.id;
 
             try {
-                const response = await fetch(`${surveyAdminUrl}/log/file/student/${surveyId}`, {
-                    method: 'POST',
-                });
+                const res = await api._request("POST", `${surveyAdminUrl}/log/file/student/${surveyId}`, null, {});
 
-                if (!response.ok) {
-                    throw new Error('유저별 파일 다운로드에 실패했습니다.');
-                }
                 const titleText = document.getElementById("survey-title").textContent;
                 const today = new Date();
                 const year = today.getFullYear();
@@ -1330,7 +1320,7 @@ <h5 class="text-xs text-gray-500 mb-2">
 
                 const todayStr = `${year}-${month}-${day}`;
 
-                const blob = await response.blob();
+                const blob = await res.blob();
                 const url = window.URL.createObjectURL(blob);
                 const a = document.createElement('a');
 
@@ -1382,13 +1372,7 @@ <h5 class="text-xs text-gray-500 mb-2">
             const surveyId = document.getElementById("survey-title").dataset.id;
 
             try {
-                const response = await fetch(`${surveyAdminUrl}/log/file/survey/${surveyId}`, {
-                    method: 'POST',
-                });
-
-                if (!response.ok) {
-                    throw new Error('문항별 파일 다운로드에 실패했습니다.');
-                }
+                const res = await api._request("POST", `${surveyAdminUrl}/log/file/survey/${surveyId}`, null, {});
                 const titleText = document.getElementById("survey-title").textContent;
                 const today = new Date();
                 const year = today.getFullYear();
@@ -1397,7 +1381,7 @@ <h5 class="text-xs text-gray-500 mb-2">
 
                 const todayStr = `${year}-${month}-${day}`;
 
-                const blob = await response.blob();
+                const blob = await res.blob();
                 const url = window.URL.createObjectURL(blob);
                 const a = document.createElement('a');
 
diff --git a/src/main/resources/templates/homepage/user/survey/survey-answer.html b/src/main/resources/templates/homepage/user/survey/survey-answer.html
index 7c5a1f5..ebe3dc6 100644
--- a/src/main/resources/templates/homepage/user/survey/survey-answer.html
+++ b/src/main/resources/templates/homepage/user/survey/survey-answer.html
@@ -44,20 +44,7 @@
     </style>
 </head>
 <body class="bg-gray-50 min-h-screen">
-<header class="bg-white border-b border-gray-200 sticky top-0 z-10">
-    <div class="container mx-auto px-4">
-        <div class="flex items-center h-16">
-            <a href="/survey/list" data-readdy="true" class="flex items-center text-gray-600 hover:text-primary">
-                <i class="ri-arrow-left-line mr-2"></i>
-                <span>설문조사 목록으로 돌아가기</span>
-            </a>
-            <div class="mx-auto text-lg font-medium"></div>
-            <div class="w-10 h-10 flex items-center justify-center rounded-full bg-primary text-white">
-                <span>관</span>
-            </div>
-        </div>
-    </div>
-</header>
+<header th:replace="~{homepage/common/survey-make-nav :: survey-make-nav}"></header>
 <div class="w-full bg-white shadow-sm progress-wrapper">
     <div class="container mx-auto px-4 py-2">
         <div class="relative h-2 bg-gray-200 rounded-full overflow-hidden">
@@ -261,31 +248,21 @@ <h1 class="text-2xl font-bold text-gray-900 mb-2">제목</h1>
         }
 
 </script>
-<script src="/js/homepage/url.js"></script>
+<script src="/js/homepage/common/url.js"></script>
+
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+
 <script th:inline="javascript"  >
     //note API받아오는 코드
     document.addEventListener('DOMContentLoaded', loadSurvey);
     async function loadSurvey() {
         try {
             const surveyId = [[${surveyId}]];
-            const response = await fetch(`${surveyUrl}/${surveyId}`); // ← 필요시 ID 파라미터 수정
-            const text = await response.text();
-            if (!response.ok) {
-                let errMsg = `${response.status} ${response.statusText}`;
-                try {
-                    const e = text ? JSON.parse(text) : null;
-                    if (e?.message) errMsg = e.message;
-                } catch {}
-                showFatalError(errMsg);
-                return;
-            }
-
-            if (!text || !text.trim()) {
-                showFatalError('해당 신청 페이지는 공개 금지 상태입니다.');
-                return;
-            }
-            const jsonText = JSON.parse(text);
-            const data = jsonText.result;
+            const data = await api.get(`${surveyUrl}/${surveyId}`);
             const now = new Date();
 
             const yyyy = now.getFullYear();
@@ -772,20 +749,10 @@ <h3 class="text-lg font-medium text-gray-900 mb-1">${q.question}</h3>
                     }
                 }
             }
+            try{
+                const result = await api.postMultipart(`${surveyUrl}/answer`, formData);
+                console.log("✅ API 성공, payload:", result);
 
-            const response = await fetch(`${surveyUrl}/answer`, {
-                method: 'POST',
-                body: formData
-            });
-
-            console.log("🔍 response 객체:", response);
-
-// 개별 정보 출력
-            console.log("✅ 상태 코드:", response.status);       // ex: 200, 500
-            console.log("✅ 성공 여부:", response.ok);           // true/false
-            console.log("✅ 상태 메시지:", response.statusText); // ex: OK, Internal Server Error
-
-            if (response.ok) {
                 const successMessage = document.createElement('div');
                 successMessage.className = 'fixed inset-0 flex items-center justify-center bg-black bg-opacity-50 z-50';
                 successMessage.innerHTML = `
@@ -806,8 +773,8 @@ <h3 class="text-xl font-bold text-center mb-2">설문조사가 제출되었습
                 setTimeout(() => {
                     window.location.href = "/survey/list";
                 }, 3000);
-            } else {
-                alert("제출에 실패했습니다.");
+            } catch(e) {
+                console.error("파일 fetch 실패:", e);
             }
         } catch (error) {
             console.error("제출 중 오류:", error);
diff --git a/src/main/resources/templates/homepage/user/survey/survey-folder-list.html b/src/main/resources/templates/homepage/user/survey/survey-folder-list.html
index e71bc1c..dba5332 100644
--- a/src/main/resources/templates/homepage/user/survey/survey-folder-list.html
+++ b/src/main/resources/templates/homepage/user/survey/survey-folder-list.html
@@ -140,7 +140,7 @@ <h3 class="text-lg font-bold text-gray-900 group-hover:text-primary" th:text="${
                     <div class="flex items-center">
                         <i class="ri-file-list-3-line mr-2 text-gray-500"></i>
 <!--                        <span th:text="'설문 ' + ${folder.surveyCount} + '개'">설문 0개</span>-->
-                        <span th:text="'설문 0 개'">설문 0개</span>
+                        <span th:text="'설문: ' + ${folder.surveyCnt} + '개'">설문 0개</span>
                     </div>
                     <div class="flex items-center">
                         <i class="ri-calendar-line mr-2 text-gray-500"></i>
@@ -166,6 +166,13 @@ <h3 class="text-lg font-bold text-gray-900 group-hover:text-primary" th:text="${
     </div>
 </main>
 
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    api.setBaseURL("/api/v1");
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+
 <script>
     // ===== 공통: API Base URL 및 인증 헤더 =====
     const folderApiUrl = "/api/v1/survey/admin/folders";
diff --git a/src/main/resources/templates/homepage/user/survey/survey-list-admin.html b/src/main/resources/templates/homepage/user/survey/survey-list-admin.html
index 37bc2b2..0061d51 100644
--- a/src/main/resources/templates/homepage/user/survey/survey-list-admin.html
+++ b/src/main/resources/templates/homepage/user/survey/survey-list-admin.html
@@ -369,7 +369,13 @@ <h3 class="text-lg font-bold text-gray-900 line-clamp-2" th:text="${survey.title
         </nav>
     </div>
 </main>
-<script src="/js/homepage/url.js"></script>
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    api.setBaseURL("/api/v1");
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+<script src="/js/homepage/common/url.js"></script>
 <script id="delete-modal-management">
 
     document.addEventListener("DOMContentLoaded", function () {
@@ -403,30 +409,22 @@ <h3 class="text-lg font-bold text-gray-900 line-clamp-2" th:text="${survey.title
         });
 
         cancelDeleteBtn.addEventListener("click", closeDeleteModal);
-        confirmDeleteBtn.addEventListener("click", function () {
+        confirmDeleteBtn.addEventListener("click", async function () {
             console.log(surveyToDelete);
             if (surveyToDelete) {
                 const surveyId = surveyToDelete.dataset.surveyId;
                 console.log(surveyId);
                 if (surveyId) {
                     console.log("fetch하기전");
-                    fetch(`${surveyAdminUrl}/${surveyId}`, {
-                        method: "DELETE"
-                    })
-                        .then(response => {
-                            if (response.ok) {
-                                surveyToDelete.remove();  // 화면에서 제거
-                                closeDeleteModal();       // 모달 닫기
-                                alert("삭제되었습니다.");
-                            } else {
-                                closeDeleteModal();
-                                alert("삭제 실패");
-                            }
-                        })
-                        .catch(error => {
-                            console.error("삭제 중 오류:", error);
-                            alert("서버 오류로 삭제에 실패했습니다.");
-                        });
+                    try {
+                        await api.delete(`/survey/admin/${surveyId}`);
+                        surveyToDelete.remove();
+                        closeDeleteModal();
+                        alert("삭제되었습니다.");
+                    } catch (e) {
+                        console.error("삭제 중 오류:", e);
+                        closeDeleteModal();
+                    }
                 }
             }
         });
@@ -470,31 +468,23 @@ <h3 class="text-lg font-bold text-gray-900 line-clamp-2" th:text="${survey.title
         });
 
         cancelCopyBtn.addEventListener("click", closeCopyModal);
-        confirmCopyBtn.addEventListener("click", function () {
+        confirmCopyBtn.addEventListener("click", async function () {
             console.log(surveyToCopy);
             if (surveyToCopy) {
                 const surveyId = surveyToCopy.dataset.surveyId;
                 console.log(surveyId);
                 if (surveyId) {
                     console.log("fetch하기전");
-                    fetch(`${surveyAdminUrl}/copy/${surveyId}`, {
-                        method: "POST"
-                    })
-                        .then(response => {
-                            if (response.ok) {
-                                surveyToCopy.remove();  // 화면에서 제거
-                                closeCopyModal();       // 모달 닫기
-                                alert("복사되었습니다.");
-                                location.reload();
-                            } else {
-                                closeCopyModal();
-                                alert("복사 실패");
-                            }
-                        })
-                        .catch(error => {
-                            console.error("복사 중 오류:", error);
-                            alert("서버 오류로 복사에 실패했습니다.");
-                        });
+                    try {
+                        await api.postJson(`/survey/admin/copy/${surveyId}`, null, {});
+                        surveyToCopy.remove();  // 화면에서 제거
+                        closeCopyModal();       // 모달 닫기
+                        alert("복사되었습니다.");
+                        location.reload();
+                    } catch (e) {
+                        console.error("복사 중 오류:", e);
+                        closeCopyModal();
+                    }
                 }
             }
         });
diff --git a/src/main/resources/templates/homepage/user/survey/survey-make.html b/src/main/resources/templates/homepage/user/survey/survey-make.html
index 58a4db4..0a4f58b 100644
--- a/src/main/resources/templates/homepage/user/survey/survey-make.html
+++ b/src/main/resources/templates/homepage/user/survey/survey-make.html
@@ -774,7 +774,7 @@ <h3 class="font-medium text-gray-700 mb-3">설문지 설정</h3>
                             <input id="isPublic"
                                    name="isShare"
                                    type="checkbox"
-                                   th:checked="${survey != null and survey.isShare}" />
+                                   th:checked="${survey == null or survey.isShare}" />
 
                             <span class="slider"></span>
                         </label>
@@ -799,11 +799,17 @@ <h3 class="font-medium text-gray-700 mb-3">설문지 설정</h3>
         </div>
     </div>
 </main>
-<script src="/js/homepage/url.js"></script>
+<script src="/js/homepage/common/url.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.15.0/Sortable.min.js"></script>
 
 <!-- 계층형 관련 스크립트 -->
 
+<script type="module" id="api-bootstrap">
+    import { api } from "/js/homepage/lib/apiClient.js";
+    window.api = api;
+    window.dispatchEvent(new Event("api-ready"));
+</script>
+
 <script id="hierarchy-management">
     document.addEventListener("DOMContentLoaded", function(){
         window.hierarchyStore = {};
@@ -1735,15 +1741,17 @@ <h3 class="font-medium text-gray-700 mb-3">설문지 설정</h3>
                 folderId,
                 isShare
             };
-            const response = await fetch(url, {
-                method: method,
-                headers: {
-                    "Content-Type": "application/json"
-                },
-                body: JSON.stringify(payload)
-            });
-
-            if (!response.ok) throw new Error("저장 실패");
+            if (method === "POST") {
+                   await api.postJson(url, payload);
+                 } else if (method === "PATCH") {
+                   await api.patchJson(url, payload);
+                 } else if (method === "PUT") {
+                   await api.putJson(url, payload);
+                 } else {
+                   await api._request(method, url, JSON.stringify(payload), {
+                         headers: { "Content-Type": "application/json" }
+                   });
+                 }
 
             showToast("success", "설문조사가 저장되었습니다");
             window.location.href = "/survey/list?folderId="+folderId;
@@ -1777,14 +1785,10 @@ <h3 class="font-medium text-gray-700 mb-3">설문지 설정</h3>
 
             try {
                 // 템플릿 API 호출
-                const res = await fetch(`/api/v1/survey/admin/template?type=${selectedType}`);
-                if (!res.ok) throw new Error("템플릿 로드 실패");
-
-                const jsonResult = await res.json();
-                const templateQuestions =jsonResult.result;
-
-                console.log(jsonResult);
-                console.log(templateQuestions);
+                const templateQuestions = await api.get(
+                       `/api/v1/survey/admin/template?type=${encodeURIComponent(selectedType)}`
+                     );
+                console.log("templateQuestions:", templateQuestions);
 
                 // 템플릿 문항 생성
                 templateQuestions.forEach((q) => {