Merge pull request #139 from HandTris/#137

TetrisMessageReq 필드 수정
HandTris · Jul 16, 2024 · 23147a9 · 23147a9
2 parents 1a23c2e + b6455f1
commit 23147a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/jungle/HandTris/presentation/TetrisController.java b/src/main/java/jungle/HandTris/presentation/TetrisController.java
@@ -54,7 +54,6 @@ public void roomOwnerInfo(@DestinationVariable("roomCode") String roomCode, Simp
 
     @MessageMapping("/{roomCode}/disconnect")
     public void handleDisconnect(SimpMessageHeaderAccessor headerAccessor, @DestinationVariable(value = "roomCode") String roomCode) {
-        System.out.println("\n========================================= controller disconnect send =========================================");
 
         // playing 중인 게임에서 탈주한 경우
         // message에서 isStart 확인
@@ -66,9 +65,9 @@ public void handleDisconnect(SimpMessageHeaderAccessor headerAccessor, @Destinat
                     {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
                     {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
                     {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
-                    {"#303030", "#303030", "#303030", "#303030", "orange", "#303030", "#303030", "#303030", "#303030", "#303030"},
-                    {"#303030", "#303030", "#303030", "#303030", "orange", "#303030", "#303030", "#303030", "#303030", "#303030"},
-                    {"#303030", "#303030", "#303030", "orange", "orange", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
+                    {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
                     {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
                     {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
                     {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
@@ -81,7 +80,7 @@ public void handleDisconnect(SimpMessageHeaderAccessor headerAccessor, @Destinat
                     {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"},
                     {"#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030", "#303030"}};
             // 탈주 유저의 상대에게 승리 메세지 보내기 ------------------------------
-            TetrisMessageReq win = new TetrisMessageReq(emptyBoard, true, false, false);
+            TetrisMessageReq win = new TetrisMessageReq(emptyBoard, true, false, false, false);
             String otherUser = headerAccessor.getHeader("otherUser").toString();
             messagingTemplate.convertAndSendToUser(otherUser, "queue/tetris/" + roomCode, win);
         }
@@ -98,8 +97,6 @@ public void handleDisconnect(SimpMessageHeaderAccessor headerAccessor, @Destinat
             RoomOwnerRes roomOwnerRes = tetrisService.checkRoomOwnerAndReady(roomCode);
             messagingTemplate.convertAndSend("/topic/owner/" + roomCode, roomOwnerRes);
         }
-
-        System.out.println("\n========================================= disconnect send 종료 =========================================");
     }
 
 }
diff --git a/src/main/java/jungle/HandTris/presentation/dto/request/TetrisMessageReq.java b/src/main/java/jungle/HandTris/presentation/dto/request/TetrisMessageReq.java
@@ -1,4 +1,5 @@
 package jungle.HandTris.presentation.dto.request;
 
-public record TetrisMessageReq(String[][] board, boolean isEnd, boolean isAttack, boolean isGaugeFull) {
+public record TetrisMessageReq(String[][] board, boolean isEnd, boolean isAddAttack, boolean isFlipAttack,
+                               boolean isDonutAttack) {
 }
diff --git a/src/main/resources/application-jwt.yml b/src/main/resources/application-jwt.yml
@@ -2,7 +2,7 @@ spring:
   jwt:
     secret: ENC(PU1sudx/G+oeBctL3FHHaRiQy+rpqRjUGCKICeDFBYi7OqL5yyowKtayBHa/QiElf64wH6hLaXwXP67yZ5amsUTH/+FLFnVHUmWqgJb4L9D1Ud3WSk5PTk+47bAfWjyc7mvMjUhYUYE=)
     access:
-      expiration: 3600000 # 1h
+      expiration: 36000000 # 10h
       header: Authorization
       subject: AccessToken
     refresh: