diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java b/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java index ae96190..e21502e 100644 --- a/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java +++ b/book-rent/src/main/java/com/example/demo/controller/AdminBookController.java @@ -1,60 +1,125 @@ package com.example.demo.controller; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.util.List; -import jakarta.servlet.http.HttpSession; - -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.SessionAttribute; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.example.demo.common.BusinessException; +import com.example.demo.common.Const; +import com.example.demo.common.LoginUser; import com.example.demo.form.BookForm; import com.example.demo.service.BookAdminService; +/** BOOK-02 書籍登録 / BOOK-03 書籍編集（管理者のみ：/admin/** で拒否）。入力 → 確認 → 完了 */ @Controller public class AdminBookController { - private final static Logger LOGGER = Logger.getLogger(AdminBookController.class.getName()); - private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！"; + private static final String NEW = "/admin/books/new"; + private static final String EDIT = "/admin/books/edit"; - HttpSession httpsession; - BookAdminService bookadmin; + private final BookAdminService bookAdminService; - @Autowired - public AdminBookController(HttpSession httpsession, BookAdminService bookadmin) { - this.httpsession = httpsession; - this.bookadmin = bookadmin; - } + public AdminBookController(BookAdminService bookAdminService) { + this.bookAdminService = bookAdminService; + } - //書籍登録入力画面を表示する - @RequestMapping(value = "/bookRegistConfirm", method = { RequestMethod.GET, RequestMethod.POST }) - public String showbookAdmin(Model model) { - try { - model.addAttribute("BookForm", new BookForm()); - return "boolRegistConfirm"; - } catch (Exception e) { - httpsession.invalidate(); - e.printStackTrace(); - LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); - return "/bookRegistInput"; - } - } + // ===== BOOK-02 登録 ===== + @GetMapping(NEW) + public String newInput(Model model) { + return input(new BookForm(), List.of(), "書籍登録", NEW, model); + } - //書籍登録を実行する - @PostMapping("/bookRegistComplete") - public String insertDepartmentResult(@ModelAttribute("BookForm") BookForm bookform, Model model) { + @PostMapping(NEW + "/input") + public String newBack(@ModelAttribute("form") BookForm form, Model model) { + return input(form, List.of(), "書籍登録", NEW, model); + } + + @PostMapping(NEW + "/confirm") + public String newConfirm(@ModelAttribute("form") BookForm form, Model model) { + List errors = bookAdminService.validate(form); + if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model); + return confirm("書籍登録", NEW, model); + } + + @PostMapping(NEW + "/execute") + public String newExecute(@ModelAttribute("form") BookForm form, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, + Model model, RedirectAttributes ra) { try { - bookadmin.register(bookform, null); - return "forward:/bookRegistComplete"; - } catch (Exception e) { - httpsession.invalidate(); - e.printStackTrace(); - LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e); - return "/bookRegistInput"; + bookAdminService.register(form, admin); + } catch (BusinessException e) { + return input(form, List.of(e.getMessage()), "書籍登録", NEW, model); } - } + ra.addFlashAttribute("message", "書籍登録が完了しました。"); + return "redirect:" + NEW + "/complete"; + } + + @GetMapping(NEW + "/complete") + public String newComplete(Model model) { + model.addAttribute("backUrl", "/books"); + model.addAttribute("backLabel", "書籍一覧に戻る"); + return "complete"; + } + + // ===== BOOK-03 編集 ===== + @GetMapping(EDIT) + public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) { + try { + BookForm form = bookAdminService.toForm(bookAdminService.find(idBook)); + return input(form, List.of(), "書籍編集", EDIT, model); + } catch (BusinessException e) { + ra.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/books"; + } + } + + @PostMapping(EDIT + "/input") + public String editBack(@ModelAttribute("form") BookForm form, Model model) { + return input(form, List.of(), "書籍編集", EDIT, model); + } + + @PostMapping(EDIT + "/confirm") + public String editConfirm(@ModelAttribute("form") BookForm form, Model model) { + List errors = bookAdminService.validate(form); + if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model); + return confirm("書籍編集", EDIT, model); + } + + @PostMapping(EDIT + "/execute") + public String editExecute(@ModelAttribute("form") BookForm form, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin, + Model model, RedirectAttributes ra) { + try { + bookAdminService.update(form, admin); + } catch (BusinessException e) { + return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model); + } + ra.addFlashAttribute("message", "書籍編集が完了しました。"); + return "redirect:" + EDIT + "/complete"; + } + + @GetMapping(EDIT + "/complete") + public String editComplete(Model model) { + return newComplete(model); + } + + private String input(BookForm form, List errors, String title, String base, Model model) { + model.addAttribute("form", form); + model.addAttribute("errors", errors); + model.addAttribute("title", title); + model.addAttribute("base", base); + return "bookInput"; + } + + private String confirm(String title, String base, Model model) { + model.addAttribute("title", title); + model.addAttribute("base", base); + return "bookConfirm"; + } } diff --git a/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java b/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java index 144d1fd..6f86154 100644 --- a/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java +++ b/book-rent/src/main/java/com/example/demo/controller/GlobalExceptionHandler.java @@ -1,5 +1,34 @@ package com.example.demo.controller; -public class GlobalExceptionHandler { + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.resource.NoResourceFoundException; + +/** 予期しない例外：内部情報を画面に出さず、原因調査用にログへ出力する（NFR-04, NFR-08） */ +@ControllerAdvice +public class GlobalExceptionHandler { + private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); + + /** 存在しないURL（favicon.ico など）はエラーログを出さず404にする */ + @ExceptionHandler(NoResourceFoundException.class) + public ModelAndView handleNotFound(NoResourceFoundException e) { + ModelAndView mav = new ModelAndView("error"); + mav.setStatus(HttpStatus.NOT_FOUND); + mav.addObject("errorMessage", "ページが見つかりません。"); + return mav; + } + + @ExceptionHandler(Exception.class) + public ModelAndView handle(Exception e) { + log.error("予期しないエラーが発生しました", e); + ModelAndView mav = new ModelAndView("error"); + mav.addObject("errorMessage", "システムエラーが発生しました。しばらくしてからもう一度お試しください。"); + return mav; + } } diff --git a/book-rent/src/main/java/com/example/demo/controller/LoanContorller.java b/book-rent/src/main/java/com/example/demo/controller/LoanContorller.java deleted file mode 100644 index 2e5d21b..0000000 --- a/book-rent/src/main/java/com/example/demo/controller/LoanContorller.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.demo.controller; - -public class LoanContorller { - -} diff --git a/book-rent/src/main/java/com/example/demo/controller/LoanController.java b/book-rent/src/main/java/com/example/demo/controller/LoanController.java new file mode 100644 index 0000000..192665a --- /dev/null +++ b/book-rent/src/main/java/com/example/demo/controller/LoanController.java @@ -0,0 +1,113 @@ +package com.example.demo.controller; + + + +import java.util.List; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.SessionAttribute; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.example.demo.common.BusinessException; +import com.example.demo.common.Const; +import com.example.demo.common.LoginUser; +import com.example.demo.service.LoanService; + +/** LOAN-01：書籍貸出申請（一般ユーザーのみ）。入力 → 確認 → 完了 */ +@Controller +@RequestMapping("/loan") +public class LoanController { + private final LoanService loanService; + + public LoanController(LoanService loanService) { + this.loanService = loanService; + } + + /** 書籍一覧 →（申請ボタン）→ 申請入力 */ + @GetMapping("/apply") + public String input(@RequestParam Integer idBook, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + Model model, RedirectAttributes ra) { + return showInput(idBook, "", "", List.of(), user, model, ra); + } + + /** 確認画面 →（申請情報入力に戻る）→ 申請入力（入力値を保持） */ + @PostMapping("/apply/input") + public String back(@RequestParam Integer idBook, + @RequestParam(defaultValue = "") String dateBorrow, + @RequestParam(defaultValue = "") String dateScheduledReturn, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + Model model, RedirectAttributes ra) { + return showInput(idBook, dateBorrow, dateScheduledReturn, List.of(), user, model, ra); + } + + /** 申請入力 →（申請確認）→ 確認 */ + @PostMapping("/apply/confirm") + public String confirm(@RequestParam Integer idBook, + @RequestParam(defaultValue = "") String dateBorrow, + @RequestParam(defaultValue = "") String dateScheduledReturn, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + Model model, RedirectAttributes ra) { + List errors = loanService.validateDates(dateBorrow, dateScheduledReturn); + if (!errors.isEmpty()) { + return showInput(idBook, dateBorrow, dateScheduledReturn, errors, user, model, ra); + } + if (user.isAdmin()) return "redirect:/menu"; + try { + model.addAttribute("book", loanService.getLendableBook(idBook)); + } catch (BusinessException e) { + ra.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/books"; + } + model.addAttribute("idBook", idBook); + model.addAttribute("dateBorrow", dateBorrow); + model.addAttribute("dateScheduledReturn", dateScheduledReturn); + return "loanApplyConfirm"; + } + + /** 確認 →（申請）→ 完了。二重送信防止のため登録後はリダイレクトする（PRG） */ + @PostMapping("/apply/execute") + public String execute(@RequestParam Integer idBook, + @RequestParam(defaultValue = "") String dateBorrow, + @RequestParam(defaultValue = "") String dateScheduledReturn, + @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser user, + RedirectAttributes ra) { + if (user.isAdmin()) return "redirect:/menu"; + try { + Integer id = loanService.apply(idBook, dateBorrow, dateScheduledReturn, user); + ra.addFlashAttribute("message", "書籍貸出申請が完了しました。（申請ID：" + id + "）"); + return "redirect:/loan/apply/complete"; + } catch (BusinessException e) { + ra.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/books"; + } + } + + @GetMapping("/apply/complete") + public String complete(Model model) { + model.addAttribute("backUrl", "/books"); + model.addAttribute("backLabel", "書籍一覧に戻る"); + return "complete"; + } + + private String showInput(Integer idBook, String dateBorrow, String dateScheduledReturn, List errors, + LoginUser user, Model model, RedirectAttributes ra) { + if (user.isAdmin()) return "redirect:/menu"; // 申請は一般ユーザーのみ + try { + model.addAttribute("book", loanService.getLendableBook(idBook)); + } catch (BusinessException e) { + ra.addFlashAttribute("errorMessage", e.getMessage()); + return "redirect:/books"; + } + model.addAttribute("idBook", idBook); + model.addAttribute("dateBorrow", dateBorrow); + model.addAttribute("dateScheduledReturn", dateScheduledReturn); + model.addAttribute("errors", errors); + return "loanApplyInput"; + } +} diff --git a/book-rent/src/main/java/com/example/demo/controller/LoginController.java b/book-rent/src/main/java/com/example/demo/controller/LoginController.java index 5880c4f..81c8dfc 100644 --- a/book-rent/src/main/java/com/example/demo/controller/LoginController.java +++ b/book-rent/src/main/java/com/example/demo/controller/LoginController.java @@ -1,5 +1,73 @@ package com.example.demo.controller; -public class LoginController { +import java.util.Optional; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.demo.common.Const; +import com.example.demo.common.LoginUser; +import com.example.demo.service.AuthService; + +/** AUTH-01：ログイン／ログアウト（login.html） */ +@Controller +public class LoginController { + private final AuthService authService; + + public LoginController(AuthService authService) { + this.authService = authService; + } + + @GetMapping("/") + public String root() { + return "redirect:/menu"; + } + + @GetMapping("/login") + public String loginForm(HttpSession session) { + if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) { + return "redirect:/menu"; + } + return "login"; + } + + @PostMapping("/login") + public String login(@RequestParam(defaultValue = "") String mailAddress, + @RequestParam(defaultValue = "") String password, + HttpServletRequest request, Model model) { + String mail = mailAddress.trim(); + model.addAttribute("mailAddress", mail); // 入力値を保持（パスワードは保持しない） + + if (mail.isEmpty() || password.isEmpty()) { + model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。"); + return "login"; + } + Optional user = authService.authenticate(mail, password); + if (user.isEmpty()) { + // どちらが誤りかは分からない文言にする + model.addAttribute("errorMessage", "メールアドレスまたはパスワードが正しくありません。"); + return "login"; + } + // セッション固定化攻撃対策：古いセッションを破棄して新規発行 + HttpSession old = request.getSession(false); + if (old != null) { + old.invalidate(); + } + request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get()); + return "redirect:/menu"; + } + + @PostMapping("/logout") + public String logout(HttpSession session) { + session.invalidate(); + return "redirect:/login"; + } } + diff --git a/book-rent/src/main/java/com/example/demo/controller/MenuController.java b/book-rent/src/main/java/com/example/demo/controller/MenuController.java index a84e905..d914065 100644 --- a/book-rent/src/main/java/com/example/demo/controller/MenuController.java +++ b/book-rent/src/main/java/com/example/demo/controller/MenuController.java @@ -1,19 +1,13 @@ package com.example.demo.controller; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +/** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */ @Controller public class MenuController { - @GetMapping("/menu") - public String showMenu(Model model) { - - // 仮のログインユーザー名 - model.addAttribute("loginUserName", "テストユーザー"); - - // menu.htmlを表示 + public String menu() { return "menu"; } } diff --git a/book-rent/src/main/java/com/example/demo/form/BookForm.java b/book-rent/src/main/java/com/example/demo/form/BookForm.java index d801e04..68f84c4 100644 --- a/book-rent/src/main/java/com/example/demo/form/BookForm.java +++ b/book-rent/src/main/java/com/example/demo/form/BookForm.java @@ -1,30 +1,71 @@ package com.example.demo.form; - /** 書籍登録・編集フォーム */ public class BookForm { - private Integer idBook; - private String isbn = ""; - private String nmBook = ""; - private String knBook = ""; - private String publisher = ""; - private String note = ""; + private Integer idBook; + private String isbn = ""; + private String nmBook = ""; + private String knBook = ""; + private String publisher = ""; + private String note = ""; - public void trim() { - isbn = t(isbn); nmBook = t(nmBook); knBook = t(knBook); publisher = t(publisher); note = t(note); - } - private static String t(String s) { return s == null ? "" : s.trim(); } + public void trim() { + isbn = t(isbn); + nmBook = t(nmBook); + knBook = t(knBook); + publisher = t(publisher); + note = t(note); + } - public Integer getIdBook() { return idBook; } - public void setIdBook(Integer v) { this.idBook = v; } - public String getIsbn() { return isbn; } - public void setIsbn(String v) { this.isbn = v; } - public String getNmBook() { return nmBook; } - public void setNmBook(String v) { this.nmBook = v; } - public String getKnBook() { return knBook; } - public void setKnBook(String v) { this.knBook = v; } - public String getPublisher() { return publisher; } - public void setPublisher(String v) { this.publisher = v; } - public String getNote() { return note; } - public void setNote(String v) { this.note = v; } + private static String t(String s) { + return s == null ? "" : s.trim(); + } + + public Integer getIdBook() { + return idBook; + } + + public void setIdBook(Integer v) { + this.idBook = v; + } + + public String getIsbn() { + return isbn; + } + + public void setIsbn(String v) { + this.isbn = v; + } + + public String getNmBook() { + return nmBook; + } + + public void setNmBook(String v) { + this.nmBook = v; + } + + public String getKnBook() { + return knBook; + } + + public void setKnBook(String v) { + this.knBook = v; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String v) { + this.publisher = v; + } + + public String getNote() { + return note; + } + + public void setNote(String v) { + this.note = v; + } } diff --git a/book-rent/src/main/resources/static/css/style.css b/book-rent/src/main/resources/static/css/style.css new file mode 100644 index 0000000..bfebba8 --- /dev/null +++ b/book-rent/src/main/resources/static/css/style.css @@ -0,0 +1,90 @@ +body +{font-family: + "Meiryo","Hiragino Sans",sans-serif; + margin:0;color:#222; + background:#f6f7f9} +header.top +{display:flex; + justify-content:space-between; + align-items:center; + background:#176a78;color:#fff; + padding:10px 20px +} +header.top form +{display:inline; + margin:0} +header.top .user +{margin-right:12px +} +main +{max-width:960px; + margin:24px auto; + padding:0 16px +} +h1 +{font-size:20px +} +.card +{background:#fff; + border:1px solid #dde; + border-radius:6px; + padding:20px; + margin-bottom:16px +} +label +{display:block; + margin:10px 0 4px; + font-weight:bold +} +input[type=text],input[type=password],input[type=email] +{width:100%; + max-width:360px; + padding:6px; + box-sizing:border-box +} +button,.btn +{display:inline-block; + background:#176a78; + color:#fff;border:0; + border-radius:4px; + padding:7px 16px; + cursor:pointer; + text-decoration:none; + font-size:14px +} +button.sub,.btn.sub +{background:#6b7b80 +} +.error +{background:#fdecea;color:#b3261e; + border:1px solid #f5c2be; + padding:8px 12px; + border-radius:4px; + margin-bottom:12px +} +.info +{background:#e8f4ea; + color:#1b5e20; + border:1px solid #bfdcc3; + padding:8px 12px; + border-radius:4px; + margin-bottom:12px +} +table +{border-collapse:collapse; + width:100%; + background:#fff +} +th,td +{border:1px solid #dde; + padding:6px 8px; + text-align:left; + font-size:14px +} +th +{background:#eaf4f6 +} +.menu a +{display:block; + margin:8px 0 +} diff --git a/book-rent/src/main/resources/templates/application.html b/book-rent/src/main/resources/templates/application.html deleted file mode 100644 index de80674..0000000 --- a/book-rent/src/main/resources/templates/application.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - 書籍貸出申請画面 - - - - - - -
- -
- - - - - - - - - 申請確認 -
蔵書ID - - 書籍名 - - 貸出日 - - 返却予定日 - -
- 書籍一覧に戻る - - - \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/applicationList.html b/book-rent/src/main/resources/templates/applicationList.html new file mode 100644 index 0000000..6cacc8b --- /dev/null +++ b/book-rent/src/main/resources/templates/applicationList.html @@ -0,0 +1,34 @@ + + + + + 書籍貸出申請一覧（承認待ち） + + + +
+
+

書籍貸出申請一覧（承認待ち）

+
+
+
+

承認待ちの申請はありません。

+ + + + + + + + + + + + + +
申請ID申請者名書籍名申請日貸出日返却予定日操作
承認
+
+

メニューに戻る

+
+ + diff --git a/book-rent/src/main/resources/templates/bookRegistConfirm.html b/book-rent/src/main/resources/templates/bookRegistConfirm.html new file mode 100644 index 0000000..a2e409e --- /dev/null +++ b/book-rent/src/main/resources/templates/bookRegistConfirm.html @@ -0,0 +1,40 @@ + + + + + + 書籍登録画面 + + + + + +
+ + + + + + + + + + + + + + + 登録 +
ISBN + 書籍名 + + 書籍名よみ + + 出版社 + + 特記事項 + +
+ 書籍情報入力に戻る \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/bookRegistInput.html b/book-rent/src/main/resources/templates/bookRegistInput.html new file mode 100644 index 0000000..74a14f2 --- /dev/null +++ b/book-rent/src/main/resources/templates/bookRegistInput.html @@ -0,0 +1,42 @@ + + + + + + 書籍登録画面 + + + + + +
+ + + + + + + + + + + + + + + 申請確認 +
ISBN + + 書籍名 + + 書籍名よみ + + 出版社 + + 特記事項 + +
+ 書籍一覧に戻る + + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/error.html b/book-rent/src/main/resources/templates/error.html new file mode 100644 index 0000000..70e22bf --- /dev/null +++ b/book-rent/src/main/resources/templates/error.html @@ -0,0 +1,17 @@ + + + + + エラー + + + +
+

エラー

+
+
+ メニューに戻る +
+
+ + diff --git a/book-rent/src/main/resources/templates/fragments/header.html b/book-rent/src/main/resources/templates/fragments/header.html new file mode 100644 index 0000000..dfe0ed6 --- /dev/null +++ b/book-rent/src/main/resources/templates/fragments/header.html @@ -0,0 +1,15 @@ + + + + + +
+ 書籍貸出管理システム + + 社員名 +
+ +
+ + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/frament/header.html b/book-rent/src/main/resources/templates/frament/header.html deleted file mode 100644 index 2571001..0000000 --- a/book-rent/src/main/resources/templates/frament/header.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - -Insert title here - - - - - \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/login.html b/book-rent/src/main/resources/templates/login.html index 6ee30de..dcd376a 100644 --- a/book-rent/src/main/resources/templates/login.html +++ b/book-rent/src/main/resources/templates/login.html @@ -2,93 +2,122 @@ - - - - - - - - - - - ログイン + + ログイン + - -
- -

ログイン

- -
- - -
- -
- - - - - - - - - - - - - - - - - - -
メールアドレス - -
パスワード - -
- - - -
- -
- -
- - - - +
+

書籍貸出管理システム

+
+

ログイン

+
+
+ + + + +

+
+
+
- \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/menu.html b/book-rent/src/main/resources/templates/menu.html index ff60b1b..0f9a7c2 100644 --- a/book-rent/src/main/resources/templates/menu.html +++ b/book-rent/src/main/resources/templates/menu.html @@ -1,28 +1,25 @@ - - - メニュー - + + メニュー + - -
-
-

メニュー

-
-
- 書籍一覧 - - - 書籍貸出申請一覧 - 貸出中書籍一覧 - 社員登録 - - 社員編集 -
-
+
+
+

メニュー

+
+
+ 書籍一覧 + + + 書籍貸出申請一覧 + 貸出中書籍一覧 + 社員登録 + + 社員編集 +
+
- - \ No newline at end of file + diff --git a/book-rent/src/main/resources/templates/returnConfirm.html b/book-rent/src/main/resources/templates/returnConfirm.html new file mode 100644 index 0000000..5d2fec6 --- /dev/null +++ b/book-rent/src/main/resources/templates/returnConfirm.html @@ -0,0 +1,31 @@ + + + + + 書籍返却確認 + + + +
+
+

書籍返却確認

+
+
+
+ + + + + + + + + + +
申請ID
申請者名
申請日
ISBN
書籍名
出版社
特記事項
貸出日
返却予定日
+
+
+ 貸出中書籍一覧に戻る +
+ + diff --git a/book_rent/.gitattributes b/book_rent/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/book_rent/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/book_rent/.gitignore b/book_rent/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/book_rent/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/book_rent/.mvn/wrapper/maven-wrapper.properties b/book_rent/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..bb58b3c --- /dev/null +++ b/book_rent/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip diff --git a/book_rent/mvnw b/book_rent/mvnw new file mode 100644 index 0000000..bd8896b --- /dev/null +++ b/book_rent/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/book_rent/mvnw.cmd b/book_rent/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/book_rent/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/book_rent/pom.xml b/book_rent/pom.xml new file mode 100644 index 0000000..0919676 --- /dev/null +++ b/book_rent/pom.xml @@ -0,0 +1,139 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.1.1 + + + com.example + book_rent + 0.0.1-SNAPSHOT + war + book_rent + + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-webmvc + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.mysql + mysql-connector-j + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.springframework.boot + spring-boot-starter-data-jpa-test + test + + + org.springframework.boot + spring-boot-starter-thymeleaf-test + test + + + org.springframework.boot + spring-boot-starter-validation-test + test + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + compile + + compile + + + + + org.projectlombok + lombok + + + + + + default-testCompile + test-compile + + testCompile + + + + + org.projectlombok + lombok + + + + + + + + + + diff --git a/book_rent/src/main/java/com/example/demo/BookRentApplication.java b/book_rent/src/main/java/com/example/demo/BookRentApplication.java new file mode 100644 index 0000000..4bffa3a --- /dev/null +++ b/book_rent/src/main/java/com/example/demo/BookRentApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class BookRentApplication { + + public static void main(String[] args) { + SpringApplication.run(BookRentApplication.class, args); + } + +} diff --git a/book_rent/src/main/java/com/example/demo/ServletInitializer.java b/book_rent/src/main/java/com/example/demo/ServletInitializer.java new file mode 100644 index 0000000..8665a44 --- /dev/null +++ b/book_rent/src/main/java/com/example/demo/ServletInitializer.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(BookRentApplication.class); + } + +} diff --git a/book_rent/src/main/resources/application.properties b/book_rent/src/main/resources/application.properties new file mode 100644 index 0000000..2cb02d2 --- /dev/null +++ b/book_rent/src/main/resources/application.properties @@ -0,0 +1,15 @@ +spring.application.name=book-rent +# --- MySQL (CREATE DATABASE.sql で作成した book_manage) --- +spring.datasource.url=jdbc:mysql://localhost:3306/book_manage?serverTimezone=Asia/Tokyo&characterEncoding=UTF-8 +spring.datasource.username=bookuser +spring.datasource.password=Book2026 + +# テーブルはSQLで作成済み。JPAでは変更しない +spring.jpa.hibernate.ddl-auto=none +spring.jpa.open-in-view=false +spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo + +spring.thymeleaf.cache=false +server.servlet.session.timeout=30m + + diff --git a/book_rent/src/test/java/com/example/demo/BookRentApplicationTests.java b/book_rent/src/test/java/com/example/demo/BookRentApplicationTests.java new file mode 100644 index 0000000..06a19da --- /dev/null +++ b/book_rent/src/test/java/com/example/demo/BookRentApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BookRentApplicationTests { + + @Test + void contextLoads() { + } + +}