Skip to content

Commit

Permalink
컨트롤러에서 return "/contract/edit"; 이라고 사용되고 있었음. 이는 절대경로로 시작하기 때문에 템플릿을 …
Browse files Browse the repository at this point in the history
…못찾는문제가 있을 수 있음. 다만 왜 로컬환경에서는 잘 찾았는지는 모르겠음, 자동화배포로 테스트 해봄 #10
  • Loading branch information
Sean-creative committed Nov 27, 2023
1 parent 96a7d26 commit 12ca03d
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion scripts/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand All @@ -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";
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class CtlApiLetterW {
@RequestMapping("/letter/w")
public String appLetter() {
log.info("user letter");
return "/app/letter";
return "app/letter";
}


Expand Down

0 comments on commit 12ca03d

Please sign in to comment.