2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 2026_0910_AI_5G_Java_MUN:7362f58c4ffca2bc34f8c17d45aa48f08fe18035
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:h-hein2 2026_0910_AI_5G_Java_MUN:m_shimizu 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:new-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi2 2026_0910_AI_5G_Java_MUN:m-ozawa 2026_0910_AI_5G_Java_MUN:h-hein
...
compare: 2026_0910_AI_5G_Java_MUN:m-ozawa
Branches Tags
2026_0910_AI_5G_Java_MUN:h-hein2 2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m_shimizu 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:new-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi2 2026_0910_AI_5G_Java_MUN:m-ozawa 2026_0910_AI_5G_Java_MUN:h-hein

21 Commits
7362f58c4f ... m-ozawa

Author SHA1 Message Date
m-shimizu
9c591c9ff2 登録確認ボタン_配置修正 2026-10-22 09:56:34 +09:00
t-eguchi
61e89fc36f 承認画面のレイアウト変更しました 2026-10-22 09:54:49 +09:00
h.hein
10182adc6d layout Edit 2026-10-22 09:29:36 +09:00
m-shimizu
e73b98e76d Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu 2026-10-21 16:27:14 +09:00
m-shimizu
b36bce38e1 FR-09 2026-10-21 16:26:55 +09:00
t-eguchi
da41c781df レイアウト変更を行いました 2026-10-21 16:22:56 +09:00
h.hein
103acf1106 Merge branch 'm_shimizu' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 14:28:51 +09:00
m-shimizu
7d5d038a9e FR-09 2026-10-21 14:27:40 +09:00
h.hein
6f56164c13 Merge branch 'o-matsuda' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 14:27:19 +09:00
o-matsuda
ce94b90bf1 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 
# Conflicts:
#	book-rent/src/main/resources/templates/employeeUpdateConfirm.html
 2026-10-21 14:26:59 +09:00
h.hein
9db673abb8 Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 10:51:51 +09:00
o-matsuda
abb1cda6bf employeeupdate.html途中 2026-10-21 10:26:08 +09:00
h.hein
3e0be17cef Employee Update Confirm 2026-10-21 10:22:00 +09:00
t-eguchi
b9036465f2 返却機能 2026-10-21 10:03:06 +09:00
o-matsuda
9728e2a983 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-21 10:02:29 +09:00
o-matsuda
fecf19636f Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-21 09:40:01 +09:00
o-matsuda
a17aa3ae93 Merge branch 'm-ozawa' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-20 16:29:51 +09:00
o-matsuda
40c08ea6b4 書籍登録のHTML途中 2026-10-20 16:10:36 +09:00
o-matsuda
f87e6d60c9 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-20 15:33:35 +09:00
o-matsuda
3f304d8e12 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 
# Conflicts:
#	book-rent/src/main/java/com/example/demo/controller/AdminBookController.java
 2026-10-20 14:36:00 +09:00
o-matsuda
3e0f27f7c0 書籍登録コントローラ作成 2026-10-20 14:26:19 +09:00
23 changed files with 1197 additions and 348 deletions
Expand all files Collapse all files

2
book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java
View File

@@ -101,7 +101,7 @@ public class AdminLoanController {
try {
loanService.returnBook(id, admin);
ra.addFlashAttribute("message", "書籍の返却が完了しました。");
return "redirect:/admin/return/complete";
return "returnComplete";
} catch (BusinessException e) {
ra.addFlashAttribute("errorMessage", e.getMessage());
return "redirect:/admin/lendings";

28
book-rent/src/main/resources/templates/approvalComplete.html
View File

@@ -4,28 +4,20 @@
<head>
<meta charset="UTF-8">
<title>書籍貸出申請</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<h1>
　　　
<div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
</h1>
<h2>書籍貸出申請を承認しました。</h2>
<form action="returnComplete" method="post" >
<div class="msgBox error" th:if="${messageError} != null">
<span class="error" th:text="${messageError.message}"></span>
</div>
</form>
<a th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
<a href="showMenu">メニューに戻る</a>
<div th:replace="~{fragments/header :: header}"></div>
<main class="complete-container">
<h1>完了</h1>
<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
<p>
<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
</p>
</main>
</body>
</html>

143
book-rent/src/main/resources/templates/approvalConfilm.html
View File

@@ -4,81 +4,82 @@
<head>
<meta charset="UTF-8">
<title>書籍貸出承認確認</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<h1>
書籍貸出承認確認　　　
<div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
<div th:replace="~{fragments/header :: header}"></div>
<main>
<h1>書籍貸出承認確認</h1>
<div class="card">
<table>
<tr>
<th>申請ID</th>
<td th:text="${r.idRequest}"></td>
</tr>
<tr>
<th>申請者名</th>
<td th:text="${r.nmApplicant}"></td>
</tr>
<tr>
<th>申請日</th>
<td th:text="${r.dateRequest}"></td>
</tr>
<tr>
<th>ISBN</th>
<td th:text="${r.isbn}"></td>
</tr>
<tr>
<th>書籍名</th>
<td th:text="${r.nmBook}" style="width: 700px;"></td>
</tr>
<tr>
<th>出版社</th>
<td th:text="${r.publisher}"></td>
</tr>
<tr>
<th>特記事項</th>
<td th:text="${r.note}"></td>
</tr>
<tr>
<th>貸出日</th>
<td th:text="${r.dateBorrow}"></td>
</tr>
<tr>
<th>返却予定日</th>
<td th:text="${r.dateScheduledReturn}"></td>
</tr>
</table>
<div class="buttonSection" style="margin-top: 20px;">
<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
style="display: inline;">
<button type="submit">承認</button>
</form>
<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
style="display: inline; margin-left: 10px;">
<button type="submit" class="sub">却下</button>
</form>
<a th:href="@{/admin/applications}" style="text-decoration: none; margin-left: 10px;">
<button type="button" class="sub">承認待ち一覧に戻る</button>
</a>
</div>
<script>
function logoutSubmit() {
if (confirm("ログアウトしますか？")) {
window.location.href = "/logout";
}
}
</script>
</div>
</h1>
<table>
<tr>
<th class="header">申請ID</th>
<td><input type="text" readonly="readonly" th:value="${r.idRequest}" /></td>
</tr>
<tr>
<th class="header">申請者名</th>
<td><input type="text" readonly="readonly" th:value="${r.nmApplicant}" /></td>
</tr>
<tr>
<th class="header">申請日</th>
<td><input type="text" readonly="readonly" th:value="${r.dateRequest}" /></td>
</tr>
<tr>
<th class="header">ISBN</th>
<td><input type="text" readonly="readonly" th:value="${r.isbn}" /></td>
</tr>
<tr>
<th class="header">書籍名</th>
<td><input type="text" readonly="readonly" th:value="${r.nmBook}" style="width: 300px;" /></td>
</tr>
<tr>
<th class="header">出版社</th>
<td><input type="text" readonly="readonly" th:value="${r.publisher}" /></td>
</tr>
<tr>
<th class="header">特記事項</th>
<td><input type="text" readonly="readonly" th:value="${r.note}" /></td>
</tr>
<tr>
<th class="header">貸出日</th>
<td><input type="text" readonly="readonly" th:value="${r.dateBorrow}" /></td>
</tr>
<tr>
<th class="header">返却予定日</th>
<td><input type="text" readonly="readonly" th:value="${r.dateScheduledReturn}" /></td>
</tr>
</table>
<div class="buttonSection" style="margin-top: 20px;">
<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post" style="display: inline;">
<button type="submit">承認</button>
</form>
<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
style="display: inline; margin-left: 10px;">
<button type="submit">却下</button>
</form>
</div>
<br>
<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
<script>
function logoutSubmit() {
if (confirm("ログアウトしますか？")) {
window.location.href = "/logout";
}
}
</script>
</main>
</body>
</html>

38
book-rent/src/main/resources/templates/approvalRejected.html
View File

@@ -1,31 +1,25 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>書籍貸出申請</title>
</head>
<head>
<meta charset="UTF-8">
<title>書籍貸出申請</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<h1>
　　　
<div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
</h1>
<h2>書籍貸出申請を却下しました。</h2>
<body>
<div th:replace="~{fragments/header :: header}"></div>
<main class="complete-container">
<h1>却下</h1>
<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
<p>
<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
</p>
<form action="returnRejected" method="post">
</main>
</body>
<div class="msgBox error" th:if="${messageError} != null">
<span class="error" th:text="${messageError.message}"></span>
</div>
</form>
<a th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
<a href="showMenu">メニューに戻る</a>
</body>
</html>

2
book-rent/src/main/resources/templates/complete.html
View File

@@ -12,7 +12,7 @@
<div class="info" th:text="${message} ?: '処理が完了しました。'"></div>
<p>
<a class="btn" th:href="@{${backUrl}}" th:text="${backLabel}">戻る</a>
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
<!-- <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
</p>
</main>
</body>

44
book-rent/src/main/resources/templates/employeeRegistComplete.html
View File

@@ -1,44 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>社員登録完了画面</title>
<link rel="stylesheet" th:href="@{/css/all.css}">
<style>
.complete-container {
width: 420px;
min-height: 140px;
margin: 50px auto;
padding: 20px;
border: 1px solid #ccc;
background-color: #eaf7f8;
}
.header {
display: flex;
justify-content: flex-end;
margin-bottom: 25px;
}
.message {
margin: 20px 0;
}
.back-link {
margin-top: 25px;
font-size: 13px;
}
</style>
</head>
<body>
<main class="complete-container">
<div class="header">
<form th:action="@{/logout}" method="post">
<button type="submit">ログアウト</button>
</form>
</div>
<p class="message">社員登録が完了しました。</p>
<div class="back-link">
<a th:href="@{/menu}">メニューに戻る</a>
</div>
</main>
</body>
</html>

101
book-rent/src/main/resources/templates/employeeRegistConfirm.html Normal file
View File

@@ -0,0 +1,101 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>社員登録確認</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<!-- 共通ヘッダー -->
<div th:replace="~{fragments/header :: header}"></div>
<main>
<h2>社員登録確認</h2>
<!-- エラーメッセージ -->
<div class="error"
th:if="${errors != null and !errors.isEmpty()}">
<p th:each="error : ${errors}"
th:text="${error}">
</p>
</div>
<!-- 登録内容確認 -->
<div class="card">
<p>以下の内容で登録します。内容を確認してください。</p>
<form th:action="@{/admin/employees/new/execute}"
th:object="${form}"
method="post">
<!-- 登録内容一覧 -->
<table>
<tbody>
<tr>
<th>社員名</th>
<td th:text="*{nmEmployee}"></td>
</tr>
<tr>
<th>社員名よみ</th>
<td th:text="*{knEmployee}"></td>
</tr>
<tr>
<th>メールアドレス</th>
<td th:text="*{mailAddress}"></td>
</tr>
<tr>
<th>パスワード</th>
<td>********</td>
</tr>
<tr>
<th>権限</th>
<td th:text="*{flgAdmin == '1' ? '管理者' : '一般'}"></td>
</tr>
</tbody>
</table>
<!-- 登録処理に必要な値を引き継ぐ -->
<input type="hidden" th:field="*{nmEmployee}">
<input type="hidden" th:field="*{knEmployee}">
<input type="hidden" th:field="*{mailAddress}">
<input type="hidden" th:field="*{password}">
<input type="hidden" th:field="*{flgAdmin}">
<!-- ボタン：左に戻る、右に登録 -->
<!-- <div style="display: flex;-->
<!-- justify-content: space-between;-->
<!-- align-items: center;-->
<!-- width: 100%;-->
<!-- margin-top: 20px;">-->
<!-- 社員情報入力に戻る -->
<p>
<a class="btn sub"
th:href="@{/admin/employees/new}">
社員情報入力に戻る
</a>
<!-- 登録 -->
<button type="submit" class="btn">
登録
</button>
</p>
</form>
</div>
</main>
</body>
</html>

95
book-rent/src/main/resources/templates/employeeRegistConfrim.html
View File

@@ -1,95 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>社員登録確認画面</title>
<link rel="stylesheet" th:href="@{/css/all.css}">
<style>
.register-container {
width: 420px;
margin: 50px auto;
padding: 20px;
border: 1px solid #ccc;
background-color: #eaf7f8;
}
.header {
display: flex;
justify-content: flex-end;
margin-bottom: 25px;
}
.form-row {
display: flex;
align-items: center;
margin-bottom: 10px;
}
.form-row label {
width: 130px;
font-size: 13px;
}
.form-row span {
font-size: 13px;
overflow-wrap: anywhere;
}
.role-row {
margin: 18px 0;
font-size: 13px;
}
.actions {
text-align: right;
margin: 20px 45px 10px 0;
}
.back-link {
margin-top: 25px;
font-size: 13px;
}
</style>
</head>
<body>
<main class="register-container">
<div class="header">
<form th:action="@{/logout}" method="post">
<button type="submit">ログアウト</button>
</form>
</div>
<h2>社員登録確認</h2>
<form th:action="@{/employees/register/complete}" method="post">
<div class="form-row">
<label>社員名</label>
<span th:text="${nmEmployee}"></span>
<input type="hidden" name="nmEmployee"
th:value="${nmEmployee}">
</div>
<div class="form-row">
<label>社員名よみ</label>
<span th:text="${knEmployee}"></span>
<input type="hidden" name="knEmployee"
th:value="${knEmployee}">
</div>
<div class="form-row">
<label>メールアドレス</label>
<span th:text="${mailAddress}"></span>
<input type="hidden" name="mailAddress"
th:value="${mailAddress}">
</div>
<div class="form-row">
<label>パスワード</label>
<span>********</span>
<input type="hidden" name="password"
th:value="${password}">
</div>
<div class="role-row">
<span th:text="${role}"></span>
<input type="hidden" name="role"
th:value="${role}">
</div>
<div class="actions">
<button type="submit">登録</button>
</div>
</form>
<div class="back-link">
<a th:href="@{/employees/register}">社員情報入力に戻る</a>
</div>
</main>
</body>
</html>

206
book-rent/src/main/resources/templates/employeeRegistInput.html
View File

@@ -1,103 +1,117 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>社員登録入力画面</title>
<link rel="stylesheet" th:href="@{/css/all.css}">
<style>
.register-container {
width: 420px;
margin: 50px auto;
padding: 20px;
border: 1px solid #ccc;
background-color: #eaf7f8;
}
.header {
display: flex;
justify-content: flex-end;
margin-bottom: 25px;
}
.form-row {
display: flex;
align-items: center;
margin-bottom: 10px;
}
.form-row label {
width: 130px;
font-size: 13px;
}
.form-row input {
width: 180px;
box-sizing: border-box;
}
.role-row {
margin: 18px 0;
font-size: 13px;
}
.actions {
text-align: right;
margin: 20px 45px 10px 0;
}
.back-link {
margin-top: 25px;
font-size: 13px;
}
</style>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>社員登録</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<main class="register-container">
<!-- ログアウト -->
<div class="header">
<form th:action="@{/logout}" method="post">
<button type="submit">ログアウト</button>
</form>
</div>
<h2>社員登録</h2>
<!-- 社員情報入力 -->
<form th:action="@{/employees/register/confirm}" method="post">
<div class="form-row">
<label for="nmEmployee">社員名</label>
<input type="text" id="nmEmployee"
name="nmEmployee" required>
</div>
<div class="form-row">
<label for="knEmployee">社員名よみ</label>
<input type="text" id="knEmployee"
name="knEmployee" required>
</div>
<div class="form-row">
<label for="mailAddress">メールアドレス</label>
<input type="email" id="mailAddress"
name="mailAddress" required>
</div>
<div class="form-row">
<label for="password">パスワード</label>
<input type="password" id="password"
name="password" required>
</div>
<!-- 権限選択 -->
<div class="role-row">
<label>
<input type="radio" name="role"
value="管理者" required>
管理者
</label>
<label>
<input type="radio" name="role"
value="一般ユーザー">
一般ユーザー
</label>
</div>
<!-- 登録確認へ -->
<div class="actions">
<button type="submit">登録確認</button>
</div>
</form>
<!-- メニューへ戻る -->
<div class="back-link">
<a th:href="@{/menu}">メニューへ戻る</a>
</div>
</main>
<!-- 共通ヘッダー -->
<div th:replace="~{fragments/header :: header}"></div>
<main>
<h2>社員登録</h2>
<!-- 入力エラー表示 -->
<div class="error" th:if="${errors != null and !errors.isEmpty()}">
<p th:each="error : ${errors}" th:text="${error}">
</p>
</div>
<!-- 社員登録フォーム -->
<div class="card">
<form th:action="@{/admin/employees/new/confirm}" th:object="${form}" method="post">
<!-- 社員名 -->
<div>
<label for="nmEmployee">社員名</label>
<input type="text" id="nmEmployee" th:field="*{nmEmployee}">
</div>
<!-- 社員名よみ -->
<div>
<label for="knEmployee">社員名よみ</label>
<input type="text" id="knEmployee" th:field="*{knEmployee}">
</div>
<!-- メールアドレス -->
<div>
<label for="mailAddress">メールアドレス</label>
<input type="email" id="mailAddress" th:field="*{mailAddress}">
</div>
<!-- パスワード -->
<div>
<label for="password">パスワード</label>
<input type="password" id="password" th:field="*{password}">
</div>
<label for="flgAdmin">管理者フラグ</label>
<select id="flgAdmin" name="flgAdmin">
<option value="0" th:selected="${form.flgAdmin == '0'}">0：一般</option>
<option value="1" th:selected="${form.flgAdmin == '1'}">1：管理者</option>
</select>
<p><a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
<button type="submit">登録確認</button>
</p>
<!-- 権限：枠線なし・横並び -->
<!-- <div style="border: none;-->
<!-- display: flex;-->
<!-- flex-direction: row;-->
<!-- align-items: center;-->
<!-- gap: 25px;-->
<!-- margin: 15px 0 25px;">-->
<!-- <label style="display: inline-flex;-->
<!-- align-items: center;-->
<!-- gap: 5px;-->
<!-- white-space: nowrap;">-->
<!-- <input type="radio"-->
<!-- th:field="*{flgAdmin}"-->
<!-- value="1">-->
<!-- 管理者-->
<!-- </label>-->
<!-- <label style="display: inline-flex;-->
<!-- align-items: center;-->
<!-- gap: 5px;-->
<!-- white-space: nowrap;">-->
<!-- <input type="radio"-->
<!-- th:field="*{flgAdmin}"-->
<!-- value="0">-->
<!-- 一般ユーザー-->
<!-- </label>-->
<!-- </div>-->
<!-- ボタン：左に戻る・右に確認 -->
<!-- <div style="display: flex;-->
<!-- justify-content: space-between;-->
<!-- align-items: center;-->
<!-- width: 100%;-->
<!-- margin-top: 20px;">-->
<!-- <a class="btn sub"-->
<!-- th:href="@{/menu}">-->
<!-- メニューに戻る-->
<!-- </a>-->
<!-- <button type="submit" class="btn">-->
<!-- 確認-->
<!-- </button>-->
<!-- </div>-->
</form>
</div>
</main>
</body>
</html>

29
book-rent/src/main/resources/templates/employeeSearch.html Normal file
View File

@@ -0,0 +1,29 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>社員検索</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<div th:replace="~{fragments/header :: header}"></div>
<main>
<h1>社員検索</h1>
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
<div class="card">
<form th:action="@{/employees/search}" method="post">
<label for="mailAddress">メールアドレス（256文字以内）</label>
<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}">
<p><button type="submit">検索</button>
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
</p>
</form>
</div>
</main>
</body>
</html>

67
book-rent/src/main/resources/templates/employeeUpdateConfirm.html Normal file
View File

@@ -0,0 +1,67 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>社員編集確認</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<div th:replace="~{fragments/header :: header}"></div>
<main>
<h1>社員編集確認</h1>
<div class="card">
<table>
<th:block th:if="${admin}">
<tr>
<th>社員名</th>
<td th:text="${form.nmEmployee}"></td>
</tr>
<tr>
<th>社員名よみ</th>
<td th:text="${form.knEmployee}"></td>
</tr>
<tr>
<th>メールアドレス</th>
<td th:text="${form.mailAddress}"></td>
</tr>
<tr>
<th>管理者フラグ</th>
<td th:text="${form.flgAdmin == '1'} ? '1：管理者' : '0：一般'"></td>
</tr>
<tr>
<th>退職フラグ</th>
<td th:text="${form.flgRetirement == '1'} ? '1：退職' : '0：所属'"></td>
</tr>
</th:block>
<tr>
<th>パスワード</th>
<td th:text="${#strings.isEmpty(form.password)} ? '（変更しない）' : '********'"></td>
</tr>
</table>
<form th:action="@{/employees/edit/execute}" method="post" style="display:inline">
<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
<input type="hidden" name="nmEmployee" th:value="${form.nmEmployee}">
<input type="hidden" name="knEmployee" th:value="${form.knEmployee}">
<input type="hidden" name="mailAddress" th:value="${form.mailAddress}">
<input type="hidden" name="flgAdmin" th:value="${form.flgAdmin}">
<input type="hidden" name="flgRetirement" th:value="${form.flgRetirement}">
<input type="hidden" name="password" th:value="${form.password}">
<button type="submit">編集</button>
</form>
<form th:action="@{/employees/edit/input}" method="post" style="display:inline">
<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
<input type="hidden" name="nmEmployee" th:value="${form.nmEmployee}">
<input type="hidden" name="knEmployee" th:value="${form.knEmployee}">
<input type="hidden" name="mailAddress" th:value="${form.mailAddress}">
<input type="hidden" name="flgAdmin" th:value="${form.flgAdmin}">
<input type="hidden" name="flgRetirement" th:value="${form.flgRetirement}">
<input type="hidden" name="password" th:value="${form.password}">
<button type="submit" class="sub">社員情報入力に戻る</button>
</form>
</div>
</main>
</body>
</html>

52
book-rent/src/main/resources/templates/employeeUpdateInput.html Normal file
View File

@@ -0,0 +1,52 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>社員編集</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<div th:replace="~{fragments/header :: header}"></div>
<main>
<h1>社員編集</h1>
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
<div class="card">
<form th:action="@{/employees/edit/confirm}" method="post">
<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
<th:block th:if="${admin}">
<label for="nmEmployee">社員名（必須・50文字以内）</label>
<input type="text" id="nmEmployee" name="nmEmployee" th:value="${form.nmEmployee}" maxlength="50">
<label for="knEmployee">社員名よみ（必須・100文字以内）</label>
<input type="text" id="knEmployee" name="knEmployee" th:value="${form.knEmployee}" maxlength="100">
<label for="mailAddress">メールアドレス（必須）</label>
<input type="text" id="mailAddress" name="mailAddress" th:value="${form.mailAddress}"
maxlength="256">
<label for="flgAdmin">管理者フラグ</label>
<select id="flgAdmin" name="flgAdmin">
<option value="0" th:selected="${form.flgAdmin == '0'}">0：一般</option>
<option value="1" th:selected="${form.flgAdmin == '1'}">1：管理者</option>
</select>
<label for="flgRetirement">退職フラグ</label>
<select id="flgRetirement" name="flgRetirement">
<option value="0" th:selected="${form.flgRetirement == '0'}">0：所属</option>
<option value="1" th:selected="${form.flgRetirement == '1'}">1：退職</option>
</select>
<label for="password">パスワード（変更する場合のみ入力）</label>
</th:block>
<th:block th:unless="${admin}">
<p>※パスワードのみ変更できます。</p>
<label for="password">新しいパスワード（必須）</label>
</th:block>
<input type="password" id="password" name="password" maxlength="256" autocomplete="new-password">
<p><button type="submit">編集確認</button>
<a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
</p>
</form>
</div>
</main>
</body>
</html>

23
book-rent/src/main/resources/templates/returnComplete.html Normal file
View File

@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>書籍返却完了</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>
<div th:replace="~{fragments/header :: header}"></div>
<main class="complete-container">
<h1>返却完了</h1>
<div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div>
<p>
<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
</p>
</main>
</body>
</html>

2
book_rent/.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
/mvnw text eol=lf
*.cmd text eol=crlf

33
book_rent/.gitignore vendored Normal file
View File

@@ -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/

3
book_rent/.mvn/wrapper/maven-wrapper.properties vendored Normal file
View File

@@ -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

295
book_rent/mvnw vendored Normal file
View File

@@ -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-<version>,maven-mvnd-<version>-<platform>}/<hash>
[ -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 "$@"

189
book_rent/mvnw.cmd vendored Normal file
View File

@@ -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-<version>,maven-mvnd-<version>-<platform>}/<hash>
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"

139
book_rent/pom.xml Normal file
View File

@@ -0,0 +1,139 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.1.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.example</groupId>
<artifactId>book_rent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>book_rent</name>
<description/>
<url/>
<licenses>
<license/>
</licenses>
<developers>
<developer/>
</developers>
<scm>
<connection/>
<developerConnection/>
<tag/>
<url/>
</scm>
<properties>
<java.version>21</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

13
book_rent/src/main/java/com/example/demo/BookRentApplication.java Normal file
View File

@@ -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);
}
}

13
book_rent/src/main/java/com/example/demo/ServletInitializer.java Normal file
View File

@@ -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);
}
}

15
book_rent/src/main/resources/application.properties Normal file
View File

@@ -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

13
book_rent/src/test/java/com/example/demo/BookRentApplicationTests.java Normal file
View File

@@ -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() {
}
}