From 12ca03d80207e5c0b2ccb13dcbd1e4a4fe711047 Mon Sep 17 00:00:00 2001 From: seonwoo Date: Mon, 27 Nov 2023 17:17:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=EC=97=90?= =?UTF-8?q?=EC=84=9C=20return=20"/contract/edit";=20=EC=9D=B4=EB=9D=BC?= =?UTF-8?q?=EA=B3=A0=20=EC=82=AC=EC=9A=A9=EB=90=98=EA=B3=A0=20=EC=9E=88?= =?UTF-8?q?=EC=97=88=EC=9D=8C.=20=EC=9D=B4=EB=8A=94=20=EC=A0=88=EB=8C=80?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EC=8B=9C=EC=9E=91=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EB=95=8C=EB=AC=B8=EC=97=90=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=EC=9D=84=20=EB=AA=BB=EC=B0=BE=EB=8A=94=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=EA=B0=80=20=EC=9E=88=EC=9D=84=20=EC=88=98=20=EC=9E=88?= =?UTF-8?q?=EC=9D=8C.=20=EB=8B=A4=EB=A7=8C=20=EC=99=9C=20=EB=A1=9C?= =?UTF-8?q?=EC=BB=AC=ED=99=98=EA=B2=BD=EC=97=90=EC=84=9C=EB=8A=94=20?= =?UTF-8?q?=EC=9E=98=20=EC=B0=BE=EC=95=98=EB=8A=94=EC=A7=80=EB=8A=94=20?= =?UTF-8?q?=EB=AA=A8=EB=A5=B4=EA=B2=A0=EC=9D=8C,=20=EC=9E=90=EB=8F=99?= =?UTF-8?q?=ED=99=94=EB=B0=B0=ED=8F=AC=EB=A1=9C=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=95=B4=EB=B4=84=20#10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/start.sh | 2 +- .../com/sjs/jsvill/controller/board/CtlApiBoard.java | 2 +- .../controller/community/CommunityController.java | 8 ++++---- .../jsvill/controller/contract/ContractController.java | 2 +- .../sjs/jsvill/controller/guest/GuestController.java | 10 +++++----- .../sjs/jsvill/controller/letter/CtlApiLetterW.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 03d55c81..dc80b146 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -13,7 +13,7 @@ echo "[$NOW] $JAR 복사" >> $START_LOG cp $ROOT_PATH/build/libs/*.jar $JAR echo "[$NOW] > $JAR 실행" >> $START_LOG -iptables -A PREROUTING -t nat -i eth0 -p tcp --dport 80 -j REDIRECT --to-port 8080 +sudo iptables -A PREROUTING -t nat -i eth0 -p tcp --destination-port 80 -j REDIRECT --to-port 8080 nohup java -jar $JAR > $APP_LOG 2> $ERROR_LOG & SERVICE_PID=$(pgrep -f $JAR) diff --git a/src/main/java/com/sjs/jsvill/controller/board/CtlApiBoard.java b/src/main/java/com/sjs/jsvill/controller/board/CtlApiBoard.java index 04bf2d33..abba3f69 100644 --- a/src/main/java/com/sjs/jsvill/controller/board/CtlApiBoard.java +++ b/src/main/java/com/sjs/jsvill/controller/board/CtlApiBoard.java @@ -41,7 +41,7 @@ public Long appBoardWp(@PathVariable String phone, @RequestBody BoardDTO dto) { @RequestMapping("/get") public String appBoardW() { log.info("user board w"); - return "/app/letter"; + return "app/letter"; } @RequestMapping("/board") diff --git a/src/main/java/com/sjs/jsvill/controller/community/CommunityController.java b/src/main/java/com/sjs/jsvill/controller/community/CommunityController.java index 5dde7bdd..6c540279 100644 --- a/src/main/java/com/sjs/jsvill/controller/community/CommunityController.java +++ b/src/main/java/com/sjs/jsvill/controller/community/CommunityController.java @@ -60,12 +60,12 @@ public String community(Model model, @PageableDefault(sort = "comRowid", directi model.addAttribute("total", list.getTotalElements()); model.addAttribute("currentPage", pageable.getPageNumber()); - return "/community/community.html"; + return "community/community.html"; } @GetMapping("/register") public String register() { - return "/community/register.html"; + return "community/register.html"; } @PostMapping("/insert") @@ -80,7 +80,7 @@ public String insert(CommunityDTO communityDTO) { @GetMapping("/read") public String read(@RequestParam("id") Long comRowid, Model model) { model.addAttribute("dto", communityService.findByComRowid(comRowid)); - return "/community/read.html"; + return "community/read.html"; } @ResponseBody @@ -101,7 +101,7 @@ public HashMap delete(@RequestParam("comRowid") Long comRowid) { @GetMapping("/edit") public String edit(@RequestParam("id") Long comRowid, Model model) { model.addAttribute("dto", communityService.findByComRowid(comRowid)); - return "/community/edit.html"; + return "community/edit.html"; } } diff --git a/src/main/java/com/sjs/jsvill/controller/contract/ContractController.java b/src/main/java/com/sjs/jsvill/controller/contract/ContractController.java index 1870d144..c936ea37 100644 --- a/src/main/java/com/sjs/jsvill/controller/contract/ContractController.java +++ b/src/main/java/com/sjs/jsvill/controller/contract/ContractController.java @@ -45,7 +45,7 @@ public String edit(Long contractRowid, Model model) { model.addAttribute("contractDTO", contractDTO); model.addAttribute("unitDTO", unitDTO); Json.stringToJson(contractDTO, "ContractController-edit/get"); - return "/contract/edit"; + return "contract/edit"; } @PostMapping("/edit") public String edit(ContractDTO contractDTO, RedirectAttributes redirectAttributes){ diff --git a/src/main/java/com/sjs/jsvill/controller/guest/GuestController.java b/src/main/java/com/sjs/jsvill/controller/guest/GuestController.java index ddff50bb..4e201ce8 100644 --- a/src/main/java/com/sjs/jsvill/controller/guest/GuestController.java +++ b/src/main/java/com/sjs/jsvill/controller/guest/GuestController.java @@ -14,25 +14,25 @@ public class GuestController { //입실 시 가이드 @GetMapping("/guestGuide1") public String guestGuide1() { - return "/guest/guestGuide1.html"; + return "guest/guestGuide1.html"; } @GetMapping("/guestGuide2") public String guestGuide2() { - return "/guest/guestGuide2.html"; + return "guest/guestGuide2.html"; } @GetMapping("/guestGuide3") public String guestGuide3() { - return "/guest/guestGuide3.html"; + return "guest/guestGuide3.html"; } @GetMapping("/guestGuide4") public String guestGuide4() { - return "/guest/guestGuide4.html"; + return "guest/guestGuide4.html"; } //퇴실 시 가이드 @GetMapping("/guestGuide5") public String guestGuide5() { - return "/guest/guestGuide5.html"; + return "guest/guestGuide5.html"; } } diff --git a/src/main/java/com/sjs/jsvill/controller/letter/CtlApiLetterW.java b/src/main/java/com/sjs/jsvill/controller/letter/CtlApiLetterW.java index 115c2277..2e698745 100644 --- a/src/main/java/com/sjs/jsvill/controller/letter/CtlApiLetterW.java +++ b/src/main/java/com/sjs/jsvill/controller/letter/CtlApiLetterW.java @@ -16,7 +16,7 @@ public class CtlApiLetterW { @RequestMapping("/letter/w") public String appLetter() { log.info("user letter"); - return "/app/letter"; + return "app/letter"; }