Deploy

.github/ISSUE_TEMPLATE/---feature-template.md

@@ -7,8 +7,6 @@ assignees: ''
 
 ---
 
-# 🚀 Feature - <!--{ 작업 내용 }-->
-
 ### 📝 Description
 
 ---

.github/ISSUE_TEMPLATE/---refactor-template.md

@@ -7,8 +7,6 @@ assignees: ''
 
 ---
 
-# 🔨 Refactor - <!--{ 작업 내용 }-->
-
 ### 📝 Description
 
 ---

.github/ISSUE_TEMPLATE/-bug-report-template.md

@@ -7,8 +7,6 @@ assignees: ''
 
 ---
 
-# 🐞 Bug - <!--{ 작업 내용 }-->
-
 ### 🕵️‍♀️ Condition
 
 ---

docker-compose.dev.yml

@@ -1,10 +1,17 @@
 version: "3"
 
+x-logging: &default-logging
+  driver: json-file
+  options:
+    max-size: "20m"
+    max-file: "3"
+
 services:
   backend:
     image: ceos17/ceos-backend-dev
     container_name: backend
     hostname: backend
+    logging: *default-logging
     env_file:
       - .env
     expose:
@@ -14,6 +21,7 @@ services:
 
   nginx:
     image: ceos17/ceos-nginx-dev
+    logging: *default-logging
     depends_on:
       - backend
     restart: always
@@ -24,6 +32,7 @@ services:
     image: mysql:latest
     container_name: mysql
     restart: always
+    logging: *default-logging
     environment:
       MYSQL_DATABASE: ceos-dev
       MYSQL_USER: ${DB_USERNAME}
@@ -46,6 +55,6 @@ services:
     image: redis:latest
     container_name: redis
     hostname: redis
+    logging: *default-logging
     ports:
       - "6379:6379"
-

docker-compose.yml

@@ -1,17 +1,25 @@
 version: "3"
 
+x-logging: &default-logging
+  driver: json-file
+  options:
+    max-size: "20m"
+    max-file: "3"
+
 services:
   backend:
     image: ceos17/ceos-backend
     container_name: backend
     hostname: backend
+    logging: *default-logging
     env_file:
       - .env
     expose:
       - "8080"
 
   nginx:
     image: ceos17/ceos-nginx
+    logging: *default-logging
     depends_on:
       - backend
     restart: always
@@ -22,5 +30,6 @@ services:
     image: redis:latest
     container_name: redis
     hostname: redis
+    logging: *default-logging
     ports:
-      - "6379:6379"
+      - "6379:6379"

src/main/java/ceos/backend/domain/activity/ActivityController.java

@@ -60,7 +60,7 @@ public void deleteActivity(@PathVariable Long id) {
     }
 
     @Operation(summary = "활동 이미지 url 생성하기")
-    @GetMapping("/image")
+    @PostMapping("/image")
     public AwsS3Url getImageUrl() {
         log.info("활동 이미지 url 생성하기");
         return activityService.getImageUrl();

src/main/java/ceos/backend/domain/admin/AdminController.java

@@ -22,8 +22,6 @@
 public class AdminController {
 
     private final AdminService adminService;
-    private static final String MOBILE = "mobile";
-    private static final String WEB = "web";
 
     @Operation(summary = "닉네임 확인")
     @PostMapping("/username")
@@ -41,11 +39,9 @@ public void signUp(@RequestBody @Valid SignUpRequest signUpRequest) {
 
     @Operation(summary = "로그인")
     @PostMapping("/signin")
-    public TokenResponse signIn(
-            HttpServletRequest request, @RequestBody @Valid SignInRequest signInRequest) {
+    public TokenResponse signIn(@RequestBody @Valid SignInRequest signInRequest) {
         log.info("로그인");
-        String device = request.getHeader("User-Agent").contains("mobile") ? MOBILE : WEB;
-        return adminService.signIn(device, signInRequest);
+        return adminService.signIn(signInRequest);
     }
 
     @Operation(summary = "아이디 찾기")
@@ -73,11 +69,9 @@ public void resetPwd(
 
     @Operation(summary = "로그아웃")
     @PostMapping("/logout")
-    public void logout(
-            HttpServletRequest request, @AuthenticationPrincipal AdminDetails adminUser) {
+    public void logout(@AuthenticationPrincipal AdminDetails adminUser) {
         log.info("로그아웃");
-        String device = request.getHeader("User-Agent").contains("mobile") ? MOBILE : WEB;
-        adminService.logout(device, adminUser);
+        adminService.logout(adminUser);
     }
 
     @Operation(summary = "토큰 재발급")

src/main/java/ceos/backend/domain/admin/helper/AdminHelper.java

@@ -148,7 +148,7 @@ public void resetPwd(ResetPwdRequest resetPwdRequest, Admin admin) {
     }
 
     public void matchesRefreshToken(String refreshToken, Admin admin) {
-        String savedToken = redisTemplate.opsForValue().get(admin.getId().toString());
+        String savedToken = redisTemplate.opsForValue().get("refresh:" + admin.getId().toString());
         if (savedToken == null || !savedToken.equals(refreshToken)) {
             throw RefreshTokenNotFound.EXCEPTION;
         }

src/main/java/ceos/backend/domain/admin/service/AdminService.java

@@ -51,14 +51,14 @@ public void signUp(SignUpRequest signUpRequest) {
     }
 
     @Transactional
-    public TokenResponse signIn(String device, SignInRequest signInRequest) {
+    public TokenResponse signIn(SignInRequest signInRequest) {
 
         final Admin admin = adminHelper.findForSignIn(signInRequest);
         final Authentication authentication = adminHelper.adminAuthorizationInput(admin);
 
         adminHelper.checkRole(admin);
 
-        String redisKey = admin.getId().toString() + ":" + device;
+        String redisKey = "refresh:" + admin.getId().toString();
 
         // 토큰 발급
         final String accessToken = tokenProvider.createAccessToken(admin.getId(), authentication);
@@ -100,10 +100,10 @@ public void resetPwd(ResetPwdRequest resetPwdRequest, AdminDetails adminUser) {
     }
 
     @Transactional
-    public void logout(String device, AdminDetails adminUser) {
+    public void logout(AdminDetails adminUser) {
         final Admin admin = adminUser.getAdmin();
 
-        String redisKey = admin.getId().toString() + ":" + device;
+        String redisKey = "refresh:" + admin.getId().toString();
 
         // 레디스 삭제
         tokenProvider.deleteRefreshToken(redisKey);
@@ -121,10 +121,13 @@ public TokenResponse reissueToken(RefreshTokenRequest refreshTokenRequest) {
         adminHelper.matchesRefreshToken(refreshToken, admin);
 
         // 토큰 재발급
+        String redisKey = "refresh:" + admin.getId();
         final String newAccessToken =
                 tokenProvider.createAccessToken(admin.getId(), authentication);
+        final String newRefreshToken =
+                tokenProvider.createRefreshToken(admin.getId(), authentication, redisKey);
 
-        return adminMapper.toTokenResponse(newAccessToken, refreshToken);
+        return adminMapper.toTokenResponse(newAccessToken, newRefreshToken);
     }
 
     @Transactional(readOnly = true)

src/main/java/ceos/backend/domain/management/ManagementController.java

@@ -71,7 +71,7 @@ public void deleteManagement(@PathVariable(name = "managerId") Long managerId) {
     }
 
     @Operation(summary = "임원진 이미지 url 생성하기")
-    @GetMapping("/image")
+    @PostMapping("/image")
     public AwsS3Url getImageUrl() {
         log.info("임원진 이미지 url 생성하기");
         return managementService.getImageUrl();

src/main/java/ceos/backend/domain/project/ProjectController.java

@@ -61,7 +61,7 @@ public void deleteActivity(@PathVariable Long projectId) {
     }
 
     @Operation(summary = "프로젝트 이미지 url 생성하기")
-    @GetMapping("/image")
+    @PostMapping("/image")
     public AwsS3Url getImageUrl() {
         log.info("프로젝트 이미지 url 생성하기");
         return projectService.getImageUrl();

src/main/java/ceos/backend/domain/sponsor/SponsorController.java

@@ -60,7 +60,7 @@ public void deleteSponsor(@PathVariable(name = "sponsorId") Long sponsorId) {
     }
 
     @Operation(summary = "스폰서 이미지 url 생성하기")
-    @GetMapping("/image")
+    @PostMapping("/image")
     public AwsS3Url getImageUrl() {
         log.info("스폰서 이미지 url 생성하기");
         return sponsorService.getImageUrl();

src/main/java/ceos/backend/domain/startup/StartupController.java

@@ -61,7 +61,7 @@ public void deleteManagement(@PathVariable(name = "startupId") Long startupId) {
     }
 
     @Operation(summary = "서비스 이미지 url 생성하기")
-    @GetMapping("/image")
+    @PostMapping("/image")
     public AwsS3Url getImageUrl() {
         log.info("서비스 이미지 url 생성하기");
         return startupService.getImageUrl();

src/main/java/ceos/backend/infra/ses/AwsSESMailGenerator.java

@@ -285,12 +285,12 @@ private void addRecruitDateToContext(Context context, Recruitment recruitment) {
 
         context.setVariable("startDateDoc", recruitment.getStartDateDoc().format(dateFormatter));
         context.setVariable("endDateDoc", recruitment.getEndDateDoc().format(dateTimeFormatter));
-        context.setVariable("resultDateDoc", recruitment.getResultDateDoc().format(dateFormatter));
+        context.setVariable("resultDateDoc", recruitment.getResultDateDoc().format(dateTimeFormatter));
         context.setVariable(
                 "startDateInterview", recruitment.getStartDateInterview().format(dateFormatter));
         context.setVariable(
                 "endDateInterview", recruitment.getEndDateInterview().format(dateFormatter));
         context.setVariable(
-                "resultDateFinal", recruitment.getResultDateFinal().format(dateFormatter));
+                "resultDateFinal", recruitment.getResultDateFinal().format(dateTimeFormatter));
     }
 }

src/main/resources/templates/component/ceosQuestionInfo.html

@@ -29,7 +29,7 @@
                 line-height: 170%;
                 color: #232527;"
                   th:text="${ceosQuestionInfo.otDate}">
-                    오티 날짜
+                    하이(from. 23기 백엔드 파트장)
             </span>
         </div>
 
@@ -55,7 +55,7 @@
                 line-height: 170%;
                 color: #232527;"
                   th:text="${ceosQuestionInfo.demodayDate}">
-                    데모
+                    몰라(from. 23기 프론트파트장)
             </span>
         </div>
 
@@ -81,7 +81,7 @@
                 line-height: 170%;
                 color: #232527;"
                   th:text="${ceosQuestionInfo.otherActivities}">
-                    백수
+                    백수(from. 23기 회장)
             </span>
         </div>
     </div>

src/main/resources/templates/component/copyright.html

@@ -21,7 +21,7 @@
         font-size: 20px;
         line-height: 150%;
         color: #D6DADF;">
-        © 2016-2026 Ceos ALL RIGHTS RESERVED.
+        © 2016-2026 CEOS ALL RIGHTS RESERVED.
     </span>
 </div>
 </html>

src/main/resources/templates/component/greeting.html

@@ -38,7 +38,7 @@
                 color: #3E4CF7;"
                     th:text="${greetInfo.generation}"
                 >
-                22</span>
+                24</span>
             <span style="
                 text-decoration: none;
                 outline: 0px;
@@ -114,7 +114,7 @@
         line-height: 170%;
         color: #232527;"
           th:text="${greetInfo.generation}">
-            22
+            24
         </span>
             <span style="
         text-decoration: none;

src/main/resources/templates/component/recruit.html

@@ -36,15 +36,15 @@
     </span>
 
         <span style="font-weight: 600;">[접수기간]</span>
-        <span th:text="${startDateDoc}">8월 20일 (수)</span> ~
-        <span th:text="${endDateDoc}">8월 27일 (수) 24:00</span> <br>
+        <span th:text="${startDateDoc}">8월 13일 (목)</span> ~
+        <span th:text="${endDateDoc}">8월 23일 (일) 22:00</span> <br>
         <span style="font-weight: 600;">[서류발표]</span>
-        <span th:text="${resultDateDoc}">8월 29일 (금)</span> <br>
+        <span th:text="${resultDateDoc}">8월 26일 (수) 14:00</span> <br>
         <span style="font-weight: 600;">[개별면접]</span>
-        <span th:text="${startDateInterview}">8월 30일 (토)</span> ~
-        <span th:text="${endDateInterview}">8월 31일 (일)</span> <br>
+        <span th:text="${startDateInterview}">8월 28일 (금)</span> ~
+        <span th:text="${endDateInterview}">8월 31일 (월)</span> <br>
         <span style="font-weight: 600;">[최종발표]</span>
-        <span th:text="${resultDateFinal}">9월 1일 (월)</span> <br>
+        <span th:text="${resultDateFinal}">8월 31일 (월) 20:00</span> <br>
         <br> <br>
 
 
@@ -90,11 +90,11 @@
         <span style="font-weight: 600;">수요일</span>
         오후 7시 (약 2시간 진행) <br>
 
-        https://maddening-bottle-962.notion.site/CEOS-23-2ef11100f5bc8142bc7beef39c257872 <br>
+        https://app.notion.com/p/CEOS-24-615ac01f4e5c835c9337018ff67f083d?source=copy_link <br>
 
         <span style="font-weight: 600;">[스터디]</span>
         파트별 요일/시간 상이 <br>
-        https://maddening-bottle-962.notion.site/CEOS-23-2fb11100f5bc80b99025f388207fcfe2 <br>
+        https://app.notion.com/p/CEOS-24-516ac01f4e5c829ab4a7811a48298755?source=copy_link <br>
         <br> <br>
 
         <span class="blue-title"

src/main/resources/templates/component/recruitGreeting.html

@@ -22,7 +22,7 @@
                 line-height: 150%;
                 color: #3E4CF7;">
             <span>CEOS </span>
-            <span th:text="${generation}">23</span>
+            <span th:text="${generation}">24</span>
             <span>기 리크루팅을 시작합니다!</span>
         </div>
 
@@ -43,7 +43,7 @@
 
             <span>
                 안녕하세요. 신촌 연합 IT 창업동아리 CEOS입니다.<br>
-                CEOS <span th:text="${generation}">23</span>기 서류 지원이 시작되었습니다! <br> <br>
+                CEOS <span th:text="${generation}">24</span>기 서류 지원이 시작되었습니다! <br> <br>
                 세오스는 기획, 디자인, 개발 역량을 겸비한 열정 있는 대학생들이 모여 창업을 경험하고 꿈을 실현할 수 있는 공간입니다.
             </span>
 

src/main/resources/templates/component/title.html

@@ -9,7 +9,7 @@
     <div style="padding: 0px 5px">
         <img
                 height="26px"
-                src="https://ceos-bucket-20.s3.ap-northeast-2.amazonaws.com/mail/CEOSlogo.png"
+                src="https://ceos-storage-dev.s3.ap-northeast-2.amazonaws.com/mail/CEOSlogo.png"
         />
     </div>
 </div>