All done

# Conflicts:
#	book-rent/src/main/resources/templates/employeeUpdateConfirm.html

book-rent/pom.xml

@@ -45,9 +45,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webmvc</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -71,26 +74,10 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa-test</artifactId>
+			<artifactId>spring-boot-starter-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>
@@ -112,6 +99,7 @@
 								<path>
 									<groupId>org.projectlombok</groupId>
 									<artifactId>lombok</artifactId>
+									<version>1.18.30</version>
 								</path>
 							</annotationProcessorPaths>
 						</configuration>
@@ -127,6 +115,7 @@
 								<path>
 									<groupId>org.projectlombok</groupId>
 									<artifactId>lombok</artifactId>
+									<version>1.18.30</version>
 								</path>
 							</annotationProcessorPaths>
 						</configuration>
@@ -135,5 +124,131 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>
+<!--<?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>-->
+<!-- webmvcから通常のwebスターターに変更 -->
+<!--<dependency>-->
+<!--<groupId>org.springframework.boot</groupId>-->
+<!--<artifactId>spring-boot-starter-web</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-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>-->
+

book-rent/src/main/java/com/example/demo/config/CompatiblePasswordEncoder.java

@@ -0,0 +1,38 @@
+package com.example.demo.config;
+ 
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+ 
+// データベースに保存されている平文パスワードと、BCryptでハッシュ化されたパスワードの両方を照合できるようにするクラス
+public class CompatiblePasswordEncoder implements PasswordEncoder {
+ 
+	// パスワードを安全にハッシュ化するためのクラスを生成
+	private final BCryptPasswordEncoder bcrypt = new BCryptPasswordEncoder();
+ 
+	// パスワードのハッシュ化
+	@Override
+	public String encode(CharSequence rawPassword) {
+		return bcrypt.encode(rawPassword);
+	}
+ 
+	@Override
+	public boolean matches(
+			CharSequence rawPassword,
+			String encodedPassword) {
+ 
+		// 保存済みパスワードが存在するか確認
+		if (encodedPassword == null) {
+			return false;
+		}
+ 
+		// 既存の平文パスワードに対応
+		if (!encodedPassword.startsWith("$2a$")
+				&& !encodedPassword.startsWith("$2b$")
+				&& !encodedPassword.startsWith("$2y$")) {
+			return rawPassword.toString().equals(encodedPassword);
+		}
+ 
+		// BCrypt形式のパスワードに対応
+		return bcrypt.matches(rawPassword, encodedPassword);
+	}
+}

book-rent/src/main/java/com/example/demo/config/CustomAuthenticationFailureHandler.java

@@ -0,0 +1,72 @@
+package com.example.demo.config;
+ 
+import java.io.IOException;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
+
+import com.example.demo.service.LoginAttemptService;
+ 
+// ログイン失敗時の処理
+@Component
+public class CustomAuthenticationFailureHandler
+        extends SimpleUrlAuthenticationFailureHandler {
+ 
+    private final LoginAttemptService loginAttemptService;
+ 
+    public CustomAuthenticationFailureHandler(
+            LoginAttemptService loginAttemptService) {
+        this.loginAttemptService = loginAttemptService;
+    }
+ 
+    @Override
+    public void onAuthenticationFailure(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            AuthenticationException exception)
+            throws IOException, ServletException {
+ 
+        // 画面から入力されたメールアドレスを取得
+        String mailAddress = request.getParameter("mailAddress");
+ 
+        // メールアドレスが空欄の場合
+        if (mailAddress == null || mailAddress.isBlank()) {
+            getRedirectStrategy().sendRedirect(
+                    request, response, "/login?error=empty");
+            return;
+        }
+ 
+        String mail = mailAddress.trim();
+ 
+        // すでにロックされている場合
+        if (loginAttemptService.isBlocked(mail)) {
+            getRedirectStrategy().sendRedirect(
+                    request, response, "/login?error=locked");
+            return;
+        }
+ 
+        // ログイン失敗回数を増やす
+        loginAttemptService.loginFailed(mail);
+ 
+        // 失敗回数の上限に達した場合
+        if (loginAttemptService.isBlocked(mail)) {
+            getRedirectStrategy().sendRedirect(
+                    request, response, "/login?error=locked");
+            return;
+        }
+ 
+        // 残りのログイン試行回数を取得
+        int remaining =
+                loginAttemptService.getRemainingAttempts(mail);
+ 
+        getRedirectStrategy().sendRedirect(
+                request, response,
+                "/login?error=failed&remaining=" + remaining);
+    }
+}
+ 

book-rent/src/main/java/com/example/demo/config/CustomAuthenticationSuccessHandler.java

@@ -0,0 +1,48 @@
+package com.example.demo.config;
+ 
+import java.io.IOException;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
+import org.springframework.stereotype.Component;
+
+import com.example.demo.common.Const;
+import com.example.demo.service.LoginAttemptService;
+ 
+@Component
+public class CustomAuthenticationSuccessHandler
+		extends SimpleUrlAuthenticationSuccessHandler {
+ 
+	private final LoginAttemptService loginAttemptService;
+ 
+	public CustomAuthenticationSuccessHandler(
+			LoginAttemptService loginAttemptService) {
+		this.loginAttemptService = loginAttemptService;
+		setDefaultTargetUrl("/menu");
+		setAlwaysUseDefaultTargetUrl(true);
+	}
+ 
+	@Override
+	public void onAuthenticationSuccess(
+			HttpServletRequest request,
+			HttpServletResponse response,
+			Authentication authentication)
+			throws IOException, ServletException {
+ 
+		if (authentication.getPrincipal() instanceof CustomUserDetails userDetails) {
+			String mail = userDetails.getUsername();
+ 
+			loginAttemptService.loginSucceeded(mail);
+ 
+			request.getSession(true).setAttribute(
+					Const.SESSION_LOGIN_USER,
+					userDetails.getLoginUser());
+		}
+ 
+		super.onAuthenticationSuccess(request, response, authentication);
+	}
+}

book-rent/src/main/java/com/example/demo/config/CustomUserDetails.java

@@ -0,0 +1,74 @@
+package com.example.demo.config;
+ 
+import java.util.Collection;
+import java.util.Collections;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import com.example.demo.common.LoginUser;
+import com.example.demo.service.LoginAttemptService;
+ 
+// システムの社員情報をSpring Securityが扱えるクラスに変更
+public class CustomUserDetails implements UserDetails {
+ 
+	private final LoginUser loginUser;
+	private final String password; // DBから取得した暗号化パスワードを保持
+	private final LoginAttemptService loginAttemptService;
+ 
+	public CustomUserDetails(LoginUser loginUser, String password, LoginAttemptService loginAttemptService) {
+		this.loginUser = loginUser;
+		this.password = password;
+		this.loginAttemptService = loginAttemptService;
+	}
+ 
+	@Override
+	public String getPassword() {
+		return this.password;
+	}
+ 
+	@Override
+	public String getUsername() {
+		return loginUser.getMailAddress();
+	}
+ 
+	// アカウントのロック状態の確認
+	@Override
+	public boolean isAccountNonLocked() {
+		return !loginAttemptService.isBlocked(getUsername());
+	}
+ 
+	
+	// 管理者判定メソッド
+	@Override
+	public Collection<? extends GrantedAuthority> getAuthorities() {
+		String role = loginUser.isAdmin()
+				? "ROLE_ADMIN"
+				: "ROLE_USER";
+ 
+		return Collections.singletonList( // 要素が一つだけの変更できないリストを作るメソッド
+				new SimpleGrantedAuthority(role));
+	}
+ 
+	@Override
+	public boolean isAccountNonExpired() {
+		return true;
+	}
+ 
+	@Override
+	public boolean isCredentialsNonExpired() {
+		return true;
+	}
+ 
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+ 
+	// ログイン成功後にコントローラー等でLoginUserを取り出すためのゲッター
+	public LoginUser getLoginUser() {
+		return loginUser;
+	}
+ 
+}

book-rent/src/main/java/com/example/demo/config/SecurityConfig.java

@@ -0,0 +1,58 @@
+package com.example.demo.config;
+ 
+import org.springframework.boot.security.autoconfigure.web.servlet.PathRequest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+ 
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+ 
+	private final CustomAuthenticationFailureHandler failureHandler;
+	private final CustomAuthenticationSuccessHandler successHandler;
+ 
+	public SecurityConfig(
+			CustomAuthenticationFailureHandler failureHandler,
+			CustomAuthenticationSuccessHandler successHandler) {
+		this.failureHandler = failureHandler;
+		this.successHandler = successHandler;
+	}
+ 
+	@Bean
+	public SecurityFilterChain securityFilterChain(
+			HttpSecurity http) throws Exception {
+ 
+		http
+				.authorizeHttpRequests(authorize -> authorize
+						.requestMatchers(
+								PathRequest.toStaticResources().atCommonLocations())
+						.permitAll()
+						.requestMatchers(
+								"/", "/index", "/error", "/login")
+						.permitAll()
+						.anyRequest().authenticated())
+				.formLogin(login -> login
+						.loginPage("/login")
+						.loginProcessingUrl("/login")
+						.usernameParameter("mailAddress")
+						.passwordParameter("password")
+						.failureHandler(failureHandler)
+						.successHandler(successHandler)
+						.permitAll())
+				.logout(logout -> logout
+						.logoutUrl("/logout")
+						.logoutSuccessUrl("/login?logout")
+						.permitAll());
+ 
+		return http.build();
+	}
+ 
+	@Bean
+	public PasswordEncoder passwordEncoder() {
+		return new CompatiblePasswordEncoder();
+	}
+}

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

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

book-rent/src/main/java/com/example/demo/controller/BookController.java

@@ -1,33 +1,90 @@
 package com.example.demo.controller;
+ 
+ 
+import java.util.List;
+import java.util.stream.IntStream;
 
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.example.demo.entity.BookCollection;
 import com.example.demo.service.BookService;
-
+ 
-
+ 
 /** BOOK-01：書籍検索（bookList.html） */
 @Controller
 public class BookController {
     private final BookService bookService;
-
+ 
     public BookController(BookService bookService) {
         this.bookService = bookService;
     }
-
+ 
+ 
     /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
     @GetMapping("/books")
     public String list(@RequestParam(defaultValue = "") String nmBook,
                        @RequestParam(defaultValue = "") String publisher,
                        @RequestParam(defaultValue = "") String note,
+                       @RequestParam(defaultValue = "0") int page,
+                       @RequestParam(defaultValue = "10") int size,
                        Model model) {
-        model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
+ 
+    	 Page<BookCollection> bookPage =
+    			 bookService.searchLendable(nmBook, publisher, note, page, size);
+    	 List<Integer> pageNumbers =
+    			 IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
+ 
+        model.addAttribute("books", bookPage);
+        model.addAttribute("bookPage", bookPage);
+        model.addAttribute("pageNumbers", pageNumbers);
         // 検索条件を保持
         model.addAttribute("nmBook", nmBook);
         model.addAttribute("publisher", publisher);
         model.addAttribute("note", note);
         return "bookList";
     }
+ 
 }
+//package com.example.demo.controller;
+//
+//
+//
+//
+//	
+//
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import com.example.demo.service.BookService;
+//
+//
+///** BOOK-01：書籍検索（bookList.html） */
+//@Controller
+//public class BookController {
+//    private final BookService bookService;
+//
+//    public BookController(BookService bookService) {
+//        this.bookService = bookService;
+//    }
+//
+//    /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
+//    @GetMapping("/books")
+//    public String list(@RequestParam(defaultValue = "") String nmBook,
+//                       @RequestParam(defaultValue = "") String publisher,
+//                       @RequestParam(defaultValue = "") String note,
+//                       Model model) {
+//        model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
+//        // 検索条件を保持
+//        model.addAttribute("nmBook", nmBook);
+//        model.addAttribute("publisher", publisher);
+//        model.addAttribute("note", note);
+//        return "bookList";
+//    }
+//
+//}

book-rent/src/main/java/com/example/demo/controller/LoginController.java

@@ -1,73 +1,140 @@
 package com.example.demo.controller;
-
+ 
-
-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";
+        return "redirect:/login";
     }
-
+ 
     @GetMapping("/login")
-    public String loginForm(HttpSession session) {
+    public String loginForm(
+            HttpSession session,
+            @RequestParam(name = "error", required = false) String error,
+            @RequestParam(name = "logout", required = false) String logout,
+            @RequestParam(name = "remaining", required = false) Integer remaining,
+            Model model) {
+ 
+        // すでにログインしている場合はメニュー画面へ
         if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) {
             return "redirect:/menu";
         }
+ 
+        // ログイン失敗時のメッセージ
+        if ("locked".equals(error)) {
+            model.addAttribute(
+                "errorMessage",
+                "ログインに5回連続で失敗したため、10分間アカウントをロックしました。"
+            );
+ 
+        } else if ("failed".equals(error) && remaining != null) {
+ 
+            if (remaining == 1) {
+                model.addAttribute(
+                    "errorMessage",
+                    "メールアドレスまたはパスワードが間違っています。あと1回間違えると、10分間ログインできなくなります。"
+                );
+            } else {
+                model.addAttribute(
+                    "errorMessage",
+                    "メールアドレスまたはパスワードが間違っています。あと"
+                    + remaining
+                    + "回間違えると、10分間ログインできなくなります。"
+                );
+            }
+ 
+        } else if (error != null) {
+            model.addAttribute(
+                "errorMessage",
+                "メールアドレスまたはパスワードが間違っています。"
+            );
+ 
+        } else if (logout != null) {
+            model.addAttribute("message", "ログアウトしました。");
+        }
+ 
         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<LoginUser> 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";
-    }
 }
-
+//package com.example.demo.controller;
+// 
+// 
+//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<LoginUser> 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";
+//    }
+//}

book-rent/src/main/java/com/example/demo/controller/MenuController.java

@@ -2,7 +2,7 @@ package com.example.demo.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-
+ 
 /** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */
 @Controller
 public class MenuController {
@@ -10,4 +10,4 @@ public class MenuController {
     public String menu() {
         return "menu";
     }
-}
+}

book-rent/src/main/java/com/example/demo/form/EmployeeForm.java

@@ -1,33 +1,82 @@
 package com.example.demo.form;
+
 /** 社員登録・編集フォーム */
 public class EmployeeForm {
-    private Integer idEmployee;
+	private Integer idEmployee;
-    private String nmEmployee = "";
+	private String nmEmployee = "";
-    private String knEmployee = "";
+	private String knEmployee = "";
-    private String mailAddress = "";
+	private String mailAddress = "";
-    private String password = "";
+	private String password = "";
-    private String flgAdmin = "0";
+	private String flgAdmin = "0";
-    private String flgRetirement = "0";
+	private String flgRetirement = "0";
 
-    public void trim() {
+	public void trim() {
-        nmEmployee = t(nmEmployee); knEmployee = t(knEmployee); mailAddress = t(mailAddress);
+		nmEmployee = t(nmEmployee);
-        flgAdmin = t(flgAdmin); flgRetirement = t(flgRetirement);
+		knEmployee = t(knEmployee);
-        if (password == null) password = "";
+		mailAddress = t(mailAddress);
-    }
+		flgAdmin = t(flgAdmin);
-    private static String t(String s) { return s == null ? "" : s.trim(); }
+		flgRetirement = t(flgRetirement);
+		if (password == null)
+			password = "";
+	}
 
-    public Integer getIdEmployee() { return idEmployee; }
+	private static String t(String s) {
-    public void setIdEmployee(Integer v) { this.idEmployee = v; }
+		return s == null ? "" : s.trim();
-    public String getNmEmployee() { return nmEmployee; }
+	}
-    public void setNmEmployee(String v) { this.nmEmployee = v; }
+
-    public String getKnEmployee() { return knEmployee; }
+	public Integer getIdEmployee() {
-    public void setKnEmployee(String v) { this.knEmployee = v; }
+		return idEmployee;
-    public String getMailAddress() { return mailAddress; }
+	}
-    public void setMailAddress(String v) { this.mailAddress = v; }
+
-    public String getPassword() { return password; }
+	public void setIdEmployee(Integer v) {
-    public void setPassword(String v) { this.password = v; }
+		this.idEmployee = v;
-    public String getFlgAdmin() { return flgAdmin; }
+	}
-    public void setFlgAdmin(String v) { this.flgAdmin = v; }
+
-    public String getFlgRetirement() { return flgRetirement; }
+	public String getNmEmployee() {
-    public void setFlgRetirement(String v) { this.flgRetirement = v; }
+		return nmEmployee;
+	}
+
+	public void setNmEmployee(String v) {
+		this.nmEmployee = v;
+	}
+
+	public String getKnEmployee() {
+		return knEmployee;
+	}
+
+	public void setKnEmployee(String v) {
+		this.knEmployee = v;
+	}
+
+	public String getMailAddress() {
+		return mailAddress;
+	}
+
+	public void setMailAddress(String v) {
+		this.mailAddress = v;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String v) {
+		this.password = v;
+	}
+
+	public String getFlgAdmin() {
+		return flgAdmin;
+	}
+
+	public void setFlgAdmin(String v) {
+		this.flgAdmin = v;
+	}
+
+	public String getFlgRetirement() {
+		return flgRetirement;
+	}
+
+	public void setFlgRetirement(String v) {
+		this.flgRetirement = v;
+	}
 }

book-rent/src/main/java/com/example/demo/repository/BookCollectionRepository.java

@@ -1,17 +1,18 @@
 package com.example.demo.repository;
-
+ 
 import java.time.LocalDateTime;
-import java.util.List;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 import com.example.demo.entity.BookCollection;
-
+ 
 public interface BookCollectionRepository extends JpaRepository<BookCollection, Integer> {
-
+ 
 	/**
 	 * 貸出可の蔵書を部分一致(AND)で検索する。
 	 * 空文字の条件は「指定なし」。LIKE の特殊文字は呼び出し側で '!' を使ってエスケープ済み。
@@ -22,11 +23,13 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
 			+ "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
 			+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
 			+ "order by b.idBook")
-	List<BookCollection> search(@Param("lending") String lending,
+	Page<BookCollection> search(
-			@Param("nm") String nm,
+	        @Param("lending") String lending,
-			@Param("publisher") String publisher,
+	        @Param("nm") String nm,
-			@Param("note") String note);
+	        @Param("publisher") String publisher,
-
+	        @Param("note") String note,
+	        Pageable pageable);
+ 
 	/**
 	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
 	 * 戻り値が0なら、既に他の操作で状態が変わっている（状態不整合）。
@@ -37,3 +40,42 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
 	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
 			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
 }
+//package com.example.demo.repository;
+//
+//import java.time.LocalDateTime;
+//import java.util.List;
+//
+//import org.springframework.data.jpa.repository.JpaRepository;
+//import org.springframework.data.jpa.repository.Modifying;
+//import org.springframework.data.jpa.repository.Query;
+//import org.springframework.data.repository.query.Param;
+//
+//import com.example.demo.entity.BookCollection;
+//
+//public interface BookCollectionRepository extends JpaRepository<BookCollection, Integer> {
+//
+//	/**
+//	 * 貸出可の蔵書を部分一致(AND)で検索する。
+//	 * 空文字の条件は「指定なし」。LIKE の特殊文字は呼び出し側で '!' を使ってエスケープ済み。
+//	 */
+//	@Query("select b from BookCollection b "
+//			+ "where b.flgLending = :lending "
+//			+ "and (:nm = '' or b.nmBook like concat('%', :nm, '%') escape '!') "
+//			+ "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
+//			+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
+//			+ "order by b.idBook")
+//	List<BookCollection> search(@Param("lending") String lending,
+//			@Param("nm") String nm,
+//			@Param("publisher") String publisher,
+//			@Param("note") String note);
+//
+//	/**
+//	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
+//	 * 戻り値が0なら、既に他の操作で状態が変わっている（状態不整合）。
+//	 */
+//	@Modifying(clearAutomatically = true, flushAutomatically = true)
+//	@Query("update BookCollection b set b.flgLending = :to, b.idUpdate = :uid, b.dateUpdate = :now "
+//			+ "where b.idBook = :id and b.flgLending = :from")
+//	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
+//			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
+//}

book-rent/src/main/java/com/example/demo/service/BookAdminService.java

@@ -32,8 +32,10 @@ public class BookAdminService {
         else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。");
         if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。");
         else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。");
-        if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。");
+        if(!f.getKnBook().matches("^[\\u3040-\\u309F]+$")) e.add("書籍名よみはひらがなで入力してください");
+        else if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。");
         if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。");
+        
         return e;
     }
 

book-rent/src/main/java/com/example/demo/service/BookService.java

@@ -1,33 +1,67 @@
 package com.example.demo.service;
-
+ 
-import java.util.List;
+import org.springframework.data.domain.Page;
-
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.example.demo.common.Const;
 import com.example.demo.entity.BookCollection;
 import com.example.demo.repository.BookCollectionRepository;
-
+ 
 /** BOOK-01：書籍検索 */
 @Service
 public class BookService {
     private final BookCollectionRepository bookRepository;
-
+ 
     public BookService(BookCollectionRepository bookRepository) {
         this.bookRepository = bookRepository;
     }
-
+ 
     /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
     @Transactional(readOnly = true)
-    public List<BookCollection> searchLendable(String nmBook, String publisher, String note) {
+    public Page<BookCollection> searchLendable(String nmBook, String publisher, String note,int page, int size) {
-        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note));
+        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),PageRequest.of(page, size));
     }
-
+ 
     /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
     static String normalize(String s) {
         if (s == null) return "";
         return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
     }
+ 
+ 
 }
-
+//package com.example.demo.service;
+//
+//import java.util.List;
+//
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import com.example.demo.common.Const;
+//import com.example.demo.entity.BookCollection;
+//import com.example.demo.repository.BookCollectionRepository;
+//
+///** BOOK-01：書籍検索 */
+//@Service
+//public class BookService {
+//    private final BookCollectionRepository bookRepository;
+//
+//    public BookService(BookCollectionRepository bookRepository) {
+//        this.bookRepository = bookRepository;
+//    }
+//
+//    /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
+//    @Transactional(readOnly = true)
+//    public List<BookCollection> searchLendable(String nmBook, String publisher, String note) {
+//        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note));
+//    }
+//
+//    /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
+//    static String normalize(String s) {
+//        if (s == null) return "";
+//        return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
+//    }
+//}
+//

book-rent/src/main/java/com/example/demo/service/CustomUserDetailsService.java

@@ -0,0 +1,47 @@
+package com.example.demo.service;
+
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.common.Const;
+import com.example.demo.common.LoginUser;
+import com.example.demo.config.CustomUserDetails;
+import com.example.demo.entity.Employee;
+import com.example.demo.repository.EmployeeRepository;
+
+//Spring Securityから依頼を受けて、ログインする社員情報をDBから取得
+@Service
+public class CustomUserDetailsService implements UserDetailsService {
+
+	private final EmployeeRepository employeeRepository;
+	private final LoginAttemptService loginAttemptService;
+
+	public CustomUserDetailsService(
+			EmployeeRepository employeeRepository,
+			LoginAttemptService loginAttemptService) {
+		this.employeeRepository = employeeRepository;
+		this.loginAttemptService = loginAttemptService;
+	}
+
+	@Override
+	public UserDetails loadUserByUsername(String maillAddress) throws UsernameNotFoundException {
+
+		Employee employee = employeeRepository.findByMailAddressAndFlgRetirement(maillAddress.trim(), Const.RETIRE_NO)
+				.orElseThrow(() -> new UsernameNotFoundException("認証に失敗しました。"));
+		// ↑社員情報が見つからない場合は例外処理
+
+		// 取得したEmployeeをLoginUserに変換する
+		LoginUser loginUser = new LoginUser(
+				employee.getIdEmployee(),
+				employee.getNmEmployee(),
+				employee.getKnEmployee(),
+				employee.getMailAddress(),
+				employee.getFlgAdmin());
+
+		// Spring Security用の形式に変換
+		return new CustomUserDetails(loginUser, employee.getPassword(), loginAttemptService);
+	}
+
+}

book-rent/src/main/java/com/example/demo/service/EmployeeService.java

@@ -7,6 +7,7 @@ import java.util.Optional;
 import java.util.regex.Pattern;
 
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,148 +18,367 @@ import com.example.demo.entity.Employee;
 import com.example.demo.form.EmployeeForm;
 import com.example.demo.repository.EmployeeRepository;
 
+
+
+
 /** EMP-01：社員登録、EMP-02：社員編集 */
 @Service
 public class EmployeeService {
-    private static final Pattern MAIL = Pattern.compile("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");
+	private static final Pattern MAIL = Pattern.compile("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");
-    private static final String MSG_DUP = "このメールアドレスは既に登録されています。";
+	private static final String MSG_DUP = "このメールアドレスは既に登録されています。";
 
-    private final EmployeeRepository employeeRepository;
+	// SecurityConfigに適用させるため
+	private final EmployeeRepository employeeRepository;
+	private final PasswordEncoder passwordEncoder;
 
-    public EmployeeService(EmployeeRepository employeeRepository) {
+	public EmployeeService(
-        this.employeeRepository = employeeRepository;
+			EmployeeRepository employeeRepository,
-    }
+			PasswordEncoder passwordEncoder) {
+		this.employeeRepository = employeeRepository;
+		this.passwordEncoder = passwordEncoder;
 
-    // ---------- 検索 ----------
+	}
 
-    @Transactional(readOnly = true)
+	// ---------- 検索 ----------
-    public Optional<Employee> findByMail(String mail) {
-        return employeeRepository.findByMailAddress(mail == null ? "" : mail.trim());
-    }
 
-    @Transactional(readOnly = true)
+	@Transactional(readOnly = true)
-    public Employee find(Integer id) {
+	public Optional<Employee> findByMail(String mail) {
-        return employeeRepository.findById(id)
+		return employeeRepository.findByMailAddress(mail == null ? "" : mail.trim());
-                .orElseThrow(() -> new BusinessException("対象の社員が見つかりません。"));
+	}
-    }
 
-    /** 編集画面の初期値（パスワードは空：管理者は変更時のみ入力） */
+	@Transactional(readOnly = true)
-    public EmployeeForm toForm(Employee e) {
+	public Employee find(Integer id) {
-        EmployeeForm f = new EmployeeForm();
+		return employeeRepository.findById(id)
-        f.setIdEmployee(e.getIdEmployee());
+				.orElseThrow(() -> new BusinessException("対象の社員が見つかりません。"));
-        f.setNmEmployee(e.getNmEmployee());
+	}
-        f.setKnEmployee(e.getKnEmployee());
-        f.setMailAddress(e.getMailAddress());
-        f.setFlgAdmin(e.getFlgAdmin());
-        f.setFlgRetirement(e.getFlgRetirement());
-        return f;
-    }
 
-    // ---------- 入力チェック ----------
+	/** 編集画面の初期値（パスワードは空：管理者は変更時のみ入力） */
+	public EmployeeForm toForm(Employee e) {
+		EmployeeForm f = new EmployeeForm();
+		f.setIdEmployee(e.getIdEmployee());
+		f.setNmEmployee(e.getNmEmployee());
+		f.setKnEmployee(e.getKnEmployee());
+		f.setMailAddress(e.getMailAddress());
+		f.setFlgAdmin(e.getFlgAdmin());
+		f.setFlgRetirement(e.getFlgRetirement());
+		return f;
+	}
 
-    /** 社員登録：社員名・よみ・メール・管理者フラグ。パスワードは初期値で登録する。 */
+	// ---------- 入力チェック ----------
-    public List<String> validateRegist(EmployeeForm f) {
-        f.trim();
-        List<String> e = new ArrayList<>();
-        checkBasic(f, e);
-        checkMail(f, null, e);
-        checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
-        return e;
-    }
 
-    /** 管理者による編集：全項目。パスワードは空なら変更しない。 */
+	/** 社員登録：社員名・よみ・メール・管理者フラグ。パスワードは初期値で登録する。 */
-    public List<String> validateUpdateByAdmin(EmployeeForm f) {
+	public List<String> validateRegist(EmployeeForm f) {
-        f.trim();
+		f.trim();
-        List<String> e = new ArrayList<>();
+		List<String> e = new ArrayList<>();
-        checkBasic(f, e);
+		checkBasic(f, e);
-        checkMail(f, f.getIdEmployee(), e);
+		checkMail(f, null, e);
-        checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
+		checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
-        checkFlag(f.getFlgRetirement(), "退職フラグ", e);
+		return e;
-        if (f.getPassword().length() > 256) e.add("パスワードは256文字以内で入力してください。");
+	}
-        return e;
-    }
 
-    /** 一般ユーザーによる編集：パスワードのみ（必須）。 */
+	/** 管理者による編集：全項目。パスワードは空なら変更しない。 */
-    public List<String> validateUpdateBySelf(EmployeeForm f) {
+	public List<String> validateUpdateByAdmin(EmployeeForm f) {
-        f.trim();
+		f.trim();
-        List<String> e = new ArrayList<>();
+		List<String> e = new ArrayList<>();
-        if (f.getPassword().isEmpty()) e.add("パスワードを入力してください。");
+		checkBasic(f, e);
-        else if (f.getPassword().length() > 256) e.add("パスワードは256文字以内で入力してください。");
+		checkMail(f, f.getIdEmployee(), e);
-        return e;
+		checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
-    }
+		checkFlag(f.getFlgRetirement(), "退職フラグ", e);
+		if (f.getPassword().length() > 256)
+			e.add("パスワードは256文字以内で入力してください。");
+		return e;
+	}
 
-    private void checkBasic(EmployeeForm f, List<String> e) {
+	/** 一般ユーザーによる編集：パスワードのみ（必須）。 */
-        if (f.getNmEmployee().isEmpty()) e.add("社員名を入力してください。");
+	public List<String> validateUpdateBySelf(EmployeeForm f) {
-        else if (f.getNmEmployee().length() > 50) e.add("社員名は50文字以内で入力してください。");
+		f.trim();
-        // ※社員名よみの文字種（ひらがなのみ等）は設計で確定する。現状は文字数のみチェック
+		List<String> e = new ArrayList<>();
-        if (f.getKnEmployee().isEmpty()) e.add("社員名よみを入力してください。");
+		if (f.getPassword().isEmpty())
-        else if (f.getKnEmployee().length() > 100) e.add("社員名よみは100文字以内で入力してください。");
+			e.add("パスワードを入力してください。");
-    }
+		else if (f.getPassword().length() > 256)
+			e.add("パスワードは256文字以内で入力してください。");
+		return e;
+	}
 
-    private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {
+	private void checkBasic(EmployeeForm f, List<String> e) {
-        String m = f.getMailAddress();
+		if (f.getNmEmployee().isEmpty())
-        if (m.isEmpty()) { e.add("メールアドレスを入力してください。"); return; }
+			e.add("社員名を入力してください。");
-        if (m.length() > 256) { e.add("メールアドレスは256文字以内で入力してください。"); return; }
+		else if (f.getNmEmployee().length() > 50)
-        if (!MAIL.matcher(m).matches()) { e.add("メールアドレスの形式が正しくありません。"); return; }
+			e.add("社員名は50文字以内で入力してください。");
-        Optional<Employee> dup = employeeRepository.findByMailAddress(m);
+		// ※社員名よみの文字種（ひらがなのみ等）は設計で確定する。現状は文字数のみチェック
-        if (dup.isPresent() && !dup.get().getIdEmployee().equals(selfId)) e.add(MSG_DUP);
+		if (f.getKnEmployee().isEmpty())
-    }
+			e.add("社員名よみを入力してください。");
+		else if (f.getKnEmployee().length() > 100)
+			e.add("社員名よみは100文字以内で入力してください。");
+		else if (!f.getKnEmployee().matches("^[\\u3040-\\u309F]+$"))
+			e.add("社員名よみはひらがなで入力してください");
+	}
 
-    private static void checkFlag(String v, String label, List<String> e) {
+	private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {
-        if (!"0".equals(v) && !"1".equals(v)) e.add(label + "が正しくありません。");
+		String m = f.getMailAddress();
-    }
+		if (m.isEmpty()) {
+			e.add("メールアドレスを入力してください。");
+			return;
+		}
+		if (m.length() > 256) {
+			e.add("メールアドレスは256文字以内で入力してください。");
+			return;
+		}
+		if (!MAIL.matcher(m).matches()) {
+			e.add("メールアドレスの形式が正しくありません。");
+			return;
+		}
+		Optional<Employee> dup = employeeRepository.findByMailAddress(m);
+		if (dup.isPresent() && !dup.get().getIdEmployee().equals(selfId))
+			e.add(MSG_DUP);
+	}
 
-    // ---------- 登録・更新 ----------
+	private static void checkFlag(String v, String label, List<String> e) {
+		if (!"0".equals(v) && !"1".equals(v))
+			e.add(label + "が正しくありません。");
+	}
 
-    @Transactional
+	// ---------- 登録・更新 ----------
-    public Integer register(EmployeeForm f, LoginUser admin) {
-        raise(validateRegist(f));
-        Employee e = new Employee();
-        e.setNmEmployee(f.getNmEmployee());
-        e.setKnEmployee(f.getKnEmployee());
-        e.setMailAddress(f.getMailAddress());
-        e.setPassword(Const.DEFAULT_PASSWORD);
-        e.setFlgAdmin(f.getFlgAdmin());
-        e.setFlgRetirement(Const.RETIRE_NO);
-        e.setIdUpdate(admin.getIdEmployee());
-        e.setDateUpdate(LocalDateTime.now());
-        try {
-            return employeeRepository.saveAndFlush(e).getIdEmployee();
-        } catch (DataIntegrityViolationException ex) {
-            throw new BusinessException(MSG_DUP);   // 同時登録によるUNIQUE制約違反
-        }
-    }
 
-    @Transactional
+	@Transactional
-    public void updateByAdmin(EmployeeForm f, LoginUser admin) {
+	public Integer register(EmployeeForm f, LoginUser admin) {
-        raise(validateUpdateByAdmin(f));
+		raise(validateRegist(f));
-        Employee e = find(f.getIdEmployee());
+		Employee e = new Employee();
-        e.setNmEmployee(f.getNmEmployee());
+		e.setNmEmployee(f.getNmEmployee());
-        e.setKnEmployee(f.getKnEmployee());
+		e.setKnEmployee(f.getKnEmployee());
-        e.setMailAddress(f.getMailAddress());
+		e.setMailAddress(f.getMailAddress());
-        if (!f.getPassword().isEmpty()) e.setPassword(f.getPassword());
+		e.setPassword(passwordEncoder.encode(Const.DEFAULT_PASSWORD));
-        e.setFlgAdmin(f.getFlgAdmin());
+		e.setFlgAdmin(f.getFlgAdmin());
-        e.setFlgRetirement(f.getFlgRetirement());
+		e.setFlgRetirement(Const.RETIRE_NO);
-        e.setIdUpdate(admin.getIdEmployee());
+		e.setIdUpdate(admin.getIdEmployee());
-        e.setDateUpdate(LocalDateTime.now());
+		e.setDateUpdate(LocalDateTime.now());
-        try {
+		try {
-            employeeRepository.saveAndFlush(e);
+			return employeeRepository.saveAndFlush(e).getIdEmployee();
-        } catch (DataIntegrityViolationException ex) {
+		} catch (DataIntegrityViolationException ex) {
-            throw new BusinessException(MSG_DUP);
+			throw new BusinessException(MSG_DUP); // 同時登録によるUNIQUE制約違反
-        }
+		}
-    }
+	}
 
-    /** 一般ユーザー：自分自身（セッションの社員ID）のパスワードのみ更新する。 */
+	@Transactional
-    @Transactional
+	public void updateByAdmin(EmployeeForm f, LoginUser admin) {
-    public void updateBySelf(EmployeeForm f, LoginUser self) {
+		raise(validateUpdateByAdmin(f));
-        raise(validateUpdateBySelf(f));
+		Employee e = find(f.getIdEmployee());
-        Employee e = find(self.getIdEmployee());
+		e.setNmEmployee(f.getNmEmployee());
-        e.setPassword(f.getPassword());
+		e.setKnEmployee(f.getKnEmployee());
-        e.setIdUpdate(self.getIdEmployee());
+		e.setMailAddress(f.getMailAddress());
-        e.setDateUpdate(LocalDateTime.now());
+		if (!f.getPassword().isEmpty()) {
-    }
+			e.setPassword(passwordEncoder.encode(f.getPassword()));
+		}
+		e.setFlgAdmin(f.getFlgAdmin());
+		e.setFlgRetirement(f.getFlgRetirement());
+		e.setIdUpdate(admin.getIdEmployee());
+		e.setDateUpdate(LocalDateTime.now());
+		try {
+			employeeRepository.saveAndFlush(e);
+		} catch (DataIntegrityViolationException ex) {
+			throw new BusinessException(MSG_DUP);
+		}
+	}
 
-    private static void raise(List<String> errors) {
+	/** 一般ユーザー：自分自身（セッションの社員ID）のパスワードのみ更新する。 */
-        if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
+	@Transactional
-    }
+	public void updateBySelf(EmployeeForm f, LoginUser self) {
+		raise(validateUpdateBySelf(f));
+		Employee e = find(self.getIdEmployee());
+		e.setPassword(passwordEncoder.encode(f.getPassword()));
+		e.setIdUpdate(self.getIdEmployee());
+		e.setDateUpdate(LocalDateTime.now());
+	}
+
+	private static void raise(List<String> errors) {
+		if (!errors.isEmpty())
+			throw new BusinessException(String.join(" ", errors));
+	}
 }
+
+//package com.example.demo.service;
+//
+//import java.time.LocalDateTime;
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Optional;
+//import java.util.regex.Pattern;
+//
+//import org.springframework.dao.DataIntegrityViolationException;
+//import org.springframework.stereotype.Service;
+//import org.springframework.transaction.annotation.Transactional;
+//
+//import com.example.demo.common.BusinessException;
+//import com.example.demo.common.Const;
+//import com.example.demo.common.LoginUser;
+//import com.example.demo.entity.Employee;
+//import com.example.demo.form.EmployeeForm;
+//import com.example.demo.repository.EmployeeRepository;
+//
+///** EMP-01：社員登録、EMP-02：社員編集 */
+//@Service
+//public class EmployeeService {
+//	private static final Pattern MAIL = Pattern.compile("^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");
+//	private static final String MSG_DUP = "このメールアドレスは既に登録されています。";
+//
+//	private final EmployeeRepository employeeRepository;
+//
+//	public EmployeeService(EmployeeRepository employeeRepository) {
+//		this.employeeRepository = employeeRepository;
+//	}
+//
+//	// ---------- 検索 ----------
+//
+//	@Transactional(readOnly = true)
+//	public Optional<Employee> findByMail(String mail) {
+//		return employeeRepository.findByMailAddress(mail == null ? "" : mail.trim());
+//	}
+//
+//	@Transactional(readOnly = true)
+//	public Employee find(Integer id) {
+//		return employeeRepository.findById(id)
+//				.orElseThrow(() -> new BusinessException("対象の社員が見つかりません。"));
+//	}
+//
+//	/** 編集画面の初期値（パスワードは空：管理者は変更時のみ入力） */
+//	public EmployeeForm toForm(Employee e) {
+//		EmployeeForm f = new EmployeeForm();
+//		f.setIdEmployee(e.getIdEmployee());
+//		f.setNmEmployee(e.getNmEmployee());
+//		f.setKnEmployee(e.getKnEmployee());
+//		f.setMailAddress(e.getMailAddress());
+//		f.setFlgAdmin(e.getFlgAdmin());
+//		f.setFlgRetirement(e.getFlgRetirement());
+//		return f;
+//	}
+//
+//	// ---------- 入力チェック ----------
+//
+//	/** 社員登録：社員名・よみ・メール・管理者フラグ。パスワードは初期値で登録する。 */
+//	public List<String> validateRegist(EmployeeForm f) {
+//		f.trim();
+//		List<String> e = new ArrayList<>();
+//		checkBasic(f, e);
+//		checkMail(f, null, e);
+//		checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
+//		return e;
+//	}
+//
+//	/** 管理者による編集：全項目。パスワードは空なら変更しない。 */
+//	public List<String> validateUpdateByAdmin(EmployeeForm f) {
+//		f.trim();
+//		List<String> e = new ArrayList<>();
+//		checkBasic(f, e);
+//		checkMail(f, f.getIdEmployee(), e);
+//		checkFlag(f.getFlgAdmin(), "管理者フラグ", e);
+//		checkFlag(f.getFlgRetirement(), "退職フラグ", e);
+//		if (f.getPassword().length() > 256)
+//			e.add("パスワードは256文字以内で入力してください。");
+//		return e;
+//	}
+//
+//	/** 一般ユーザーによる編集：パスワードのみ（必須）。 */
+//	public List<String> validateUpdateBySelf(EmployeeForm f) {
+//		f.trim();
+//		List<String> e = new ArrayList<>();
+//		if (f.getPassword().isEmpty())
+//			e.add("パスワードを入力してください。");
+//		else if (f.getPassword().length() > 256)
+//			e.add("パスワードは256文字以内で入力してください。");
+//		return e;
+//	}
+//
+//	private void checkBasic(EmployeeForm f, List<String> e) {
+//		if (f.getNmEmployee().isEmpty())
+//			e.add("社員名を入力してください。");
+//		else if (f.getNmEmployee().length() > 50)
+//			e.add("社員名は50文字以内で入力してください。");
+//		// ※社員名よみの文字種（ひらがなのみ等）は設計で確定する。現状は文字数のみチェック
+//		if (f.getKnEmployee().isEmpty())
+//			e.add("社員名よみを入力してください。");
+//		else if (f.getKnEmployee().length() > 100)
+//			e.add("社員名よみは100文字以内で入力してください。");
+//		else if (!f.getKnEmployee().matches("^[\\u3040-\\u309F]+$"))
+//			e.add("社員名よみはひらがなで入力してください");
+//	}
+//
+//	private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {
+//		String m = f.getMailAddress();
+//		if (m.isEmpty()) {
+//			e.add("メールアドレスを入力してください。");
+//			return;
+//		}
+//		if (m.length() > 256) {
+//			e.add("メールアドレスは256文字以内で入力してください。");
+//			return;
+//		}
+//		if (!MAIL.matcher(m).matches()) {
+//			e.add("メールアドレスの形式が正しくありません。");
+//			return;
+//		}
+//		Optional<Employee> dup = employeeRepository.findByMailAddress(m);
+//		if (dup.isPresent() && !dup.get().getIdEmployee().equals(selfId))
+//			e.add(MSG_DUP);
+//	}
+//
+//	private static void checkFlag(String v, String label, List<String> e) {
+//		if (!"0".equals(v) && !"1".equals(v))
+//			e.add(label + "が正しくありません。");
+//	}
+//
+//	// ---------- 登録・更新 ----------
+//
+//	@Transactional
+//	public Integer register(EmployeeForm f, LoginUser admin) {
+//		raise(validateRegist(f));
+//		Employee e = new Employee();
+//		e.setNmEmployee(f.getNmEmployee());
+//		e.setKnEmployee(f.getKnEmployee());
+//		e.setMailAddress(f.getMailAddress());
+//		e.setPassword(Const.DEFAULT_PASSWORD);
+//		e.setFlgAdmin(f.getFlgAdmin());
+//		e.setFlgRetirement(Const.RETIRE_NO);
+//		e.setIdUpdate(admin.getIdEmployee());
+//		e.setDateUpdate(LocalDateTime.now());
+//		try {
+//			return employeeRepository.saveAndFlush(e).getIdEmployee();
+//		} catch (DataIntegrityViolationException ex) {
+//			throw new BusinessException(MSG_DUP); // 同時登録によるUNIQUE制約違反
+//		}
+//	}
+//
+//	@Transactional
+//	public void updateByAdmin(EmployeeForm f, LoginUser admin) {
+//		raise(validateUpdateByAdmin(f));
+//		Employee e = find(f.getIdEmployee());
+//		e.setNmEmployee(f.getNmEmployee());
+//		e.setKnEmployee(f.getKnEmployee());
+//		e.setMailAddress(f.getMailAddress());
+//		if (!f.getPassword().isEmpty())
+//			e.setPassword(f.getPassword());
+//		e.setFlgAdmin(f.getFlgAdmin());
+//		e.setFlgRetirement(f.getFlgRetirement());
+//		e.setIdUpdate(admin.getIdEmployee());
+//		e.setDateUpdate(LocalDateTime.now());
+//		try {
+//			employeeRepository.saveAndFlush(e);
+//		} catch (DataIntegrityViolationException ex) {
+//			throw new BusinessException(MSG_DUP);
+//		}
+//	}
+//
+//	/** 一般ユーザー：自分自身（セッションの社員ID）のパスワードのみ更新する。 */
+//	@Transactional
+//	public void updateBySelf(EmployeeForm f, LoginUser self) {
+//		raise(validateUpdateBySelf(f));
+//		Employee e = find(self.getIdEmployee());
+//		e.setPassword(f.getPassword());
+//		e.setIdUpdate(self.getIdEmployee());
+//		e.setDateUpdate(LocalDateTime.now());
+//	}
+//
+//	private static void raise(List<String> errors) {
+//		if (!errors.isEmpty())
+//			throw new BusinessException(String.join(" ", errors));
+//	}
+//}

book-rent/src/main/java/com/example/demo/service/LoginAttemptService.java

@@ -0,0 +1,101 @@
+package com.example.demo.service;
+ 
+import java.time.LocalDateTime;
+import java.util.Locale;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.springframework.stereotype.Service;
+ 
+// 失敗回数とロック時間を管理
+@Service
+public class LoginAttemptService {
+ 
+	// 最大失敗回数
+	private static final int MAX_ATTEMPTS = 5;
+	// ロック時間
+	private static final int LOCK_MINUTES = 10;
+ 
+	// 失敗回数を保存
+	private final ConcurrentMap<String, AttemptState> attempts = new ConcurrentHashMap<>();
+ 
+	public static class AttemptState {
+		// 何回失敗したか
+		private final int failedAttempts;
+		// いつロックを解除するか
+		private final LocalDateTime lockedUntil;
+ 
+		private AttemptState(int failedAttempts, LocalDateTime lockedUntil) {
+			this.failedAttempts = failedAttempts;
+			this.lockedUntil = lockedUntil;
+		}
+	}
+ 
+	private String normalize(String mailAddress) {
+		return mailAddress.trim().toLowerCase(Locale.ROOT);
+	}
+ 
+	// ログイン失敗時
+	public void loginFailed(String mailAddress) {
+		String mail = normalize(mailAddress);
+		LocalDateTime now = LocalDateTime.now();
+		AttemptState current = attempts.get(mail);
+ 
+		// ロック中なら何もしない
+		if (current != null && current.lockedUntil != null
+&& now.isBefore(current.lockedUntil)) {
+			return;
+		}
+ 
+		// 失敗回数を数える
+		int count = (current == null || current.lockedUntil != null)
+				? 1
+				: current.failedAttempts + 1;
+ 
+		// 5回失敗したら10分間ロック
+		LocalDateTime lockTime = count >= MAX_ATTEMPTS
+				? now.plusMinutes(LOCK_MINUTES)
+				: null;
+ 
+		// 失敗回数とロック時間を保存
+		attempts.put(mail, new AttemptState(count, lockTime));
+	}
+ 
+	// 現在ロック中かどうか判定
+	public boolean isBlocked(String mailAddress) {
+		String mail = normalize(mailAddress);
+		AttemptState current = attempts.get(mail);
+ 
+		if (current == null) {
+			return false;
+		}
+		if (current.lockedUntil == null) {
+			return false;
+		}
+ 
+		// 10分経過したらロックを解除
+		if (!LocalDateTime.now().isBefore(current.lockedUntil)) {
+			attempts.remove(mail);
+			return false;
+		}
+ 
+		return true;
+ 
+	}
+ 
+	// ログイン成功時に、過去の失敗回数をきれいにリセットする
+	public void loginSucceeded(String mailAddress) {
+		attempts.remove(normalize(mailAddress));
+	}
+ 
+	public int getFailedAttempts(String mailAddress) {
+		AttemptState state = attempts.get(normalize(mailAddress));
+		return state == null ? 0 : state.failedAttempts;
+	}
+ 
+	public int getRemainingAttempts(String mailAddress) {
+		int failed = getFailedAttempts(mailAddress);
+		return Math.max(0, MAX_ATTEMPTS - failed);
+	}
+ 
+}

book-rent/src/main/resources/application.properties

@@ -10,4 +10,4 @@ spring.jpa.open-in-view=false
 spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
  
 spring.thymeleaf.cache=false
-server.servlet.session.timeout=30m
+server.servlet.session.timeout=30m

book-rent/src/main/resources/static/css/style.css

@@ -1,90 +1,134 @@
-body
+/* ----------------------------------------------------
-{font-family:
+   Login Layout & Animation Styles (Updated)
-	"Meiryo","Hiragino Sans",sans-serif;
+---------------------------------------------------- */
-	margin:0;color:#222;
+body {
-	background:#f6f7f9}
+    font-family: "Meiryo", "Hiragino Sans", sans-serif;
-header.top
+    margin: 0;
-{display:flex;
+    color: #222;
-	justify-content:space-between;
+    background: #f6f7f9;
-	align-items:center;
-	background:#176a78;color:#fff;
-	padding:10px 20px
 }
-header.top form
+header.top {
-{display:inline;
+    display: flex;
-	margin:0}
+    justify-content: space-between;
-header.top .user
+    align-items: center;
-{margin-right:12px
+    background: #176a78;
+    color: #fff;
+    padding: 10px 20px;
 }
-main
+header.top form { display: inline; margin: 0; }
-{max-width:960px;
+header.top .user { margin-right: 12px; }
-	margin:24px auto;
+main { max-width: 960px; margin: 24px auto; padding: 0 16px; }
-	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; }
+
+/* Flexbox Layout: ဘယ်ဘက် Icon နှင့် ညာဘက် Login အချက်အလက်များ ဘေးချင်းယှဉ်ရန် */
+.login-container-flex {
+    display: flex;
+    align-items: flex-start;
+    gap: 35px; /* Icon နှင့် Form ကြား အကွာအဝေး */
 }
-h1
+
-{font-size:20px
+/* ဘယ်ဘက်ခြမ်း Icon Box Styling */
+.avatar-box {
+    flex-shrink: 0;
+    width: 90px;
+    height: 90px;
+    background: #eaf4f6;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.4s ease;
+    cursor: pointer;
+    margin-top: 5px;
 }
-.card
+
-{background:#fff;
+.avatar-box:hover {
-	border:1px solid #dde;
+    transform: scale(1.08);
-	border-radius:6px;
+    background: #d5edf1;
-	padding:20px;
-	margin-bottom:16px
 }
-label
+
-{display:block;
+/* ညာဘက်ခြမ်း Form Area ကို အပြည့်အသုံးပြုရန် */
-	margin:10px 0 4px;
+.form-content-area {
-	font-weight:bold
+    flex-grow: 1;
 }
-input[type=text],input[type=password],input[type=email]
+
-{width:100%;
+/* 1. FALSE / ERROR State (တုန်ခါမည်) */
-	max-width:360px;
+.card.shake {
-	padding:6px;
+    animation: shake 0.4s ease-in-out;
-	box-sizing:border-box
 }
-button,.btn
+
-{display:inline-block;
+.avatar-box.error-state {
-	background:#176a78;
+    background: #fdecea !important;
-	color:#fff;border:0;
+    animation: pulseError 0.4s ease-in-out;
-	border-radius:4px;
-	padding:7px 16px;
-	cursor:pointer;
-	text-decoration:none;
-	font-size:14px
 }
-button.sub,.btn.sub
+
-{background:#6b7b80
+@keyframes shake {
+    0%, 100% { transform: translateX(0); }
+    20%, 60% { transform: translateX(-8px); }
+    40%, 80% { transform: translateX(8px); }
 }
-.error
+
-{background:#fdecea;color:#b3261e;
+@keyframes pulseError {
-	border:1px solid #f5c2be;
+    0% { transform: scale(1); }
-	padding:8px 12px;
+    50% { transform: scale(1.15); }
-	border-radius:4px;
+    100% { transform: scale(1); }
-	margin-bottom:12px
 }
-.info
+
-{background:#e8f4ea;
+/* 2. TRUE / SUCCESS State (အောင်မြင်မှု Animation) */
-	color:#1b5e20;
+.avatar-box.success-state {
-	border:1px solid #bfdcc3;
+    background: #e8f4ea !important;
-	padding:8px 12px;
+    animation: successFly 0.6s ease-in-out forwards;
-	border-radius:4px;
-	margin-bottom:12px
 }
-table
+
-{border-collapse:collapse;
+@keyframes successFly {
-	width:100%;
+    0% { transform: scale(1); }
-	background:#fff
+    40% { transform: scale(1.2) translateY(-8px); }
+    100% { transform: scale(0.9) translateY(-20px); opacity: 0.8; }
 }
-th,td
+
-{border:1px solid #dde;
+/* Responsive (ဖုန်းစခရင်သေးများတွင် အောက်သို့ ဆင်းသွားစေရန်) */
-	padding:6px 8px;
+@media (max-width: 600px) {
-	text-align:left;
+    .login-container-flex {
-	font-size:14px
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+    }
+    .form-content-area {
+        width: 100%;
+    }
+    input[type=text], input[type=password], input[type=email] {
+        max-width: 100% !important;
+    }
 }
-th
+/* ページネーション */
-{background:#eaf4f6
+.page-number {
+    display: inline-block;
+    background: #eaf4f6;
+    color: #176a78;
+    border: 1px solid #d4e3e6;
+    border-radius: 4px;
+    padding: 7px 12px;
+    margin: 2px;
+    text-decoration: none;
+    font-size: 14px;
 }
-.menu a
+ 
-{display:block;
+.page-number:hover {
-	margin:8px 0
+    background: #d5edf1;
 }
+.page-number.active {
+    background: #176a78;
+    color: #fff;
+    border-color: #176a78;
+}

book-rent/src/main/resources/templates/approvalComplete.html

@@ -4,28 +4,20 @@
 <head>
 	<meta charset="UTF-8">
 	<title>書籍貸出申請</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
-	<h1>
+	<div th:replace="~{fragments/header :: header}"></div>
-		　　　
+	<main class="complete-container">
-		<div class="rightSection">
+	<h1>完了</h1>
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+	<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
-			<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>
 
+	<p>
+		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
+		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+	</p>
+	</main>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalConfilm.html

@@ -4,81 +4,82 @@
 <head>
 	<meta charset="UTF-8">
 	<title>書籍貸出承認確認</title>
-
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
-	<h1>
+	<div th:replace="~{fragments/header :: header}"></div>
-		書籍貸出承認確認　　　
+	<main>
-		<div class="rightSection">
+		<h1>書籍貸出承認確認</h1>
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+		<div class="card">
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+			<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>
+	</main>
-
-
-	<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>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalRejected.html

@@ -1,31 +1,25 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 
-<head>
+	<head>
-	<meta charset="UTF-8">
+		<meta charset="UTF-8">
-	<title>書籍貸出申請</title>
+		<title>書籍貸出申請</title>
-</head>
+		<link rel="stylesheet" th:href="@{/css/style.css}">
+	</head>
 
-<body>
+	<body>
-	<h1>
+		<div th:replace="~{fragments/header :: header}"></div>
-		　　　
+		<main class="complete-container">
-		<div class="rightSection">
+		<h1>却下</h1>
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
+			<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-	</h1>
-	<h2>書籍貸出申請を却下しました。</h2>
 
+			<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>

book-rent/src/main/resources/templates/bookList.html

@@ -1,12 +1,12 @@
 <!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>
@@ -26,11 +26,11 @@
 				</p>
 			</form>
 		</div>
-
+ 
 		<div class="card">
 			<h2>検索結果</h2>
-			<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>
+			<p th:if="${bookPage.isEmpty()}">該当する書籍はありません。</p>
-			<table th:unless="${#lists.isEmpty(books)}">
+			<table th:unless="${bookPage.isEmpty()}">
 				<thead>
 					<tr>
 						<th>蔵書ID</th>
@@ -60,8 +60,89 @@
 					</tr>
 				</tbody>
 			</table>
+			<a class="page-number"
+			   th:if="${bookPage.hasPrevious()}"
+			   th:href="@{/books(page=${bookPage.number-1}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}">前へ</a>
+			<span th:each="pageNum : ${pageNumbers}">
+			    <a class="page-number"
+				   th:classappend="${pageNum == bookPage.number} ? ' active' : ''"
+				   th:href="@{/books(page=${pageNum}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}"
+			       th:text="${pageNum + 1}"></a>
+			</span>
+			<a class="page-number"
+			   th:if="${bookPage.hasNext()}"
+			   th:href="@{/books(page=${bookPage.number+1}, nmBook=${nmBook}, publisher=${publisher}, note=${note})}">次へ</a>
+			
 		</div>
 	</main>
+	
 </body>
+ 
+</html>
+<!--<!DOCTYPE html>-->
+<!--<html xmlns:th="http://www.thymeleaf.org">-->
 
-</html>
+<!--<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="card">-->
+<!--			<form th:action="@{/books}" method="get">-->
+<!--				<label for="nmBook">書籍名</label>-->
+<!--				<input type="text" id="nmBook" name="nmBook" th:value="${nmBook}">-->
+<!--				<label for="publisher">出版社</label>-->
+<!--				<input type="text" id="publisher" name="publisher" th:value="${publisher}">-->
+<!--				<label for="note">特記事項</label>-->
+<!--				<input type="text" id="note" name="note" th:value="${note}">-->
+<!--				<p><button type="submit">検索</button>-->
+<!--					<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
+<!--					<a class="btn" th:if="${session.loginUser.admin}" th:href="@{/admin/books/new}">書籍新規登録</a>-->
+<!--				</p>-->
+<!--			</form>-->
+<!--		</div>-->
+
+<!--		<div class="card">-->
+<!--			<h2>検索結果</h2>-->
+<!--			<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>-->
+<!--			<table th:unless="${#lists.isEmpty(books)}">-->
+<!--				<thead>-->
+<!--					<tr>-->
+<!--						<th>蔵書ID</th>-->
+<!--						<th>ISBN</th>-->
+<!--						<th>書籍名</th>-->
+<!--						<th>書籍名よみ</th>-->
+<!--						<th>出版社</th>-->
+<!--						<th>特記事項</th>-->
+<!--						<th>操作</th>-->
+<!--					</tr>-->
+<!--				</thead>-->
+<!--				<tbody>-->
+<!--					<tr th:each="b : ${books}">-->
+<!--						<td th:text="${b.idBook}"></td>-->
+<!--						<td th:text="${b.isbn}"></td>-->
+<!--						<td th:text="${b.nmBook}"></td>-->
+<!--						<td th:text="${b.knBook}"></td>-->
+<!--						<td th:text="${b.publisher}"></td>-->
+<!--						<td th:text="${b.note}"></td>-->
+<!--						<td>-->
+<!--							 一般：貸出申請(LOAN-01) ／ 管理者：編集(BOOK-03) -->
+<!--							<a class="btn" th:unless="${session.loginUser.admin}"-->
+<!--								th:href="@{/loan/apply(idBook=${b.idBook})}">貸出申請</a>-->
+<!--							<a class="btn" th:if="${session.loginUser.admin}"-->
+<!--								th:href="@{/admin/books/edit(idBook=${b.idBook})}">編集</a>-->
+<!--						</td>-->
+<!--					</tr>-->
+<!--				</tbody>-->
+<!--			</table>-->
+<!--		</div>-->
+<!--	</main>-->
+<!--</body>-->
+
+<!--</html>-->

book-rent/src/main/resources/templates/complete.html

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

book-rent/src/main/resources/templates/employeeRegistConfirm.html

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

book-rent/src/main/resources/templates/employeeRegistInput.html

@@ -0,0 +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/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">
+
+			<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>

book-rent/src/main/resources/templates/employeeSearch.html

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

book-rent/src/main/resources/templates/employeeUpdateConfirm.html

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

book-rent/src/main/resources/templates/employeeUpdateInput.html

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

book-rent/src/main/resources/templates/login.html

@@ -1,123 +1,117 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
-
 <head>
-	<meta charset="UTF-8">
+  <meta charset="UTF-8">
-	<title>ログイン</title>
+  <title>ログイン</title>
-	<link rel="stylesheet" th:href="@{/css/style.css}">
+  
+  <!-- Lordicon Script -->
+  <script src="https://cdn.lordicon.com/lordicon.js"></script>
+  
+  <link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
-
 <body>
-	<main>
+<main>
-		<h1>書籍貸出管理システム</h1>
+  <h1>書籍貸出管理システム</h1>
-		<div class="card">
+  <div class="card" id="loginCard">
-			<h2>ログイン</h2>
+    
-			<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+    <!-- Main Flex Container: ဘယ်ဘက် Icon နှင့် ညာဘက် Form Area ကို ဘေးချင်းယှဉ်ရန် -->
-			<form th:action="@{/login}" method="post">
+    <div class="login-container-flex">
-				<label for="mailAddress">メールアドレス</label>
+      
-				<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}"
+      <!-- ဘယ်ဘက်ခြမ်းရှိ Lordicon Avatar Box -->
-					autocomplete="username">
+      <div class="avatar-box" id="avatarBox">
-				<label for="password">パスワード</label>
+        <lord-icon
-				<input type="password" id="password" name="password" autocomplete="current-password">
+          id="lordIcon"
-				<p><button type="submit">ログイン</button></p>
+          src="https://cdn.lordicon.com/dxjqoygy.json"
-			</form>
+          trigger="hover"
-		</div>
+          colors="primary:#176a78,secondary:#08a88a"
-	</main>
+          style="width:90px;height:90px">
+        </lord-icon>
+      </div>
+
+      <!-- ညာဘက်ခြမ်းရှိ Login Content (ခေါင်းစဉ်နှင့် Form အားလုံး ပါဝင်သည်) -->
+      <div class="form-content-area">
+        <h2>ログイン</h2>
+        
+        <!-- Error Message -->
+        <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+        
+        <form th:action="@{/login}" method="post" id="loginForm">
+          <label for="mailAddress">メールアドレス</label>
+          <input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}" autocomplete="username">
+          
+          <label for="password">パスワード</label>
+          <input type="password" id="password" name="password" autocomplete="current-password">
+          
+          <p><button type="submit">ログイン</button></p>
+        </form>
+      </div>
+
+    </div>
+
+  </div>
+</main>
+
+<script>
+  const loginCard = document.getElementById('loginCard');
+  const lordIcon = document.getElementById('lordIcon');
+  const avatarBox = document.getElementById('avatarBox');
+  const errorDiv = document.querySelector('.error');
+  const loginForm = document.getElementById('loginForm');
+
+  // 1. Icon နှိပ်လျှင် Animation လှုပ်ရှားရန်
+  if (lordIcon) {
+      lordIcon.addEventListener('click', () => {
+          lordIcon.setAttribute('trigger', 'morph');
+          setTimeout(() => {
+              lordIcon.setAttribute('trigger', 'hover');
+          }, 1000);
+      });
+  }
+
+  // 2. Login မှားယွင်းသောအခါ (False / Error) -> Card Shake Animation & Icon Color Change
+  if (errorDiv) {
+      loginCard.classList.add('shake');
+      if (avatarBox) {
+          avatarBox.classList.add('error-state');
+      }
+      if (lordIcon) {
+          lordIcon.setAttribute('colors', 'primary:#b3261e,secondary:#f5c2be');
+      }
+  }
+
+  // 3. Login နှိပ်လိုက်ချိန် (True / Success Animation State)
+  if (loginForm) {
+      loginForm.addEventListener('submit', function(e) {
+          if (avatarBox && lordIcon) {
+              avatarBox.classList.add('success-state');
+              lordIcon.setAttribute('colors', 'primary:#1b5e20,secondary:#81c784');
+          }
+      });
+  }
+</script>
 </body>
-
 </html>
-
 <!--<!DOCTYPE html>-->
 <!--<html xmlns:th="http://www.thymeleaf.org">-->
-
+<!--<head>>-->
-<!--<head>-->
+<!--  <meta charset="UTF-8">-->
-<!--    <meta charset="UTF-8">-->
+<!--  <title>ログイン</title>-->
-<!--    <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
+<!--  <link rel="stylesheet" th:href="@{/css/style.css}">-->
-
-<!--     外部スクリプトの読み込み -->
-<!--    <script th:src="@{/js/common.js}"></script>-->
-
-<!--     CSSの読み込み -->
-<!--    <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">-->
-<!--    <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">-->
-
-<!--    <title>ログイン</title>-->
 <!--</head>-->
-
 <!--<body>-->
-
+<!--<main>-->
-<!--    <div class="loginContainer">-->
+<!--  <h1>書籍貸出管理システム</h1>-->
-
+<!--  <div class="card">-->
-<!--        <h1>ログイン</h1>-->
+<!--    <h2>ログイン</h2>-->
-
+<!--    <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>-->
-<!--        <form th:action="@{/doLogin}"-->
+<!--    <form th:action="@{/login}" method="post">-->
-<!--              method="post"-->
+<!--      <label for="mailAddress">メールアドレス</label>-->
-<!--              th:object="${loginInfoForm}">-->
+<!--      <input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}" autocomplete="username">-->
-
+<!--      <label for="password">パスワード</label>-->
-<!--             エラーメッセージ -->
+<!--      <input type="password" id="password" name="password" autocomplete="current-password">-->
-<!--            <div class="msgBox error"-->
+<!--      <p><button type="submit">ログイン</button></p>-->
-<!--                 th:if="${messageError != null}">-->
+<!--    </form>-->
-<!--                <span class="error"-->
+<!--  </div>-->
-<!--                      th:text="${messageError.message}"></span>-->
+<!--</main>-->
-<!--            </div>-->
-
-<!--            <table>-->
-<!--                 メールアドレス -->
-<!--                <tr>-->
-<!--                    <th class="header">メールアドレス</th>-->
-<!--                    <td>-->
-<!--                        <input-->
-<!--                            id="mailAddress"-->
-<!--                            type="text"-->
-<!--                            th:field="*{mailAddress}"-->
-<!--                            placeholder="メールアドレス"-->
-<!--                            required-->
-<!--                        />-->
-<!--                    </td>-->
-<!--                </tr>-->
-
-<!--                 パスワード -->
-<!--                <tr>-->
-<!--                    <th class="header">パスワード</th>-->
-<!--                    <td>-->
-<!--                        <input-->
-<!--                            id="password"-->
-<!--                            type="password"-->
-<!--                            th:field="*{password}"-->
-<!--                            placeholder="パスワード"-->
-<!--                            required-->
-<!--                        />-->
-<!--                    </td>-->
-<!--                </tr>-->
-
-<!--                 ボタン -->
-<!--                <tr>-->
-<!--                    <td class="btnArea" colspan="2">-->
-<!--                        <input-->
-<!--                            type="submit"-->
-<!--                            value="ログイン"-->
-<!--                        />-->
-
-<!--                        <button-->
-<!--                            type="button"-->
-<!--                            onclick="clearInput()">-->
-<!--                            リセット-->
-<!--                        </button>-->
-<!--                    </td>-->
-<!--                </tr>-->
-<!--            </table>-->
-
-<!--        </form>-->
-
-<!--    </div>-->
-
-<!--     入力内容のリセット -->
-<!--    <script>-->
-<!--        function clearInput() {-->
-<!--            document.getElementById('mailAddress').value = '';-->
-<!--            document.getElementById('password').value = '';-->
-<!--        }-->
-<!--    </script>-->
-
 <!--</body>-->
-<!--</html>-->
+<!--</html>-->

book-rent/src/main/resources/templates/menu.html

@@ -23,3 +23,6 @@
 </main>
 </body>
 </html>
+ 
+
+ 

book-rent/src/main/resources/templates/returnComplete.html

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

book_rent/.gitattributes

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

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/

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

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

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

book_rent/pom.xml

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

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

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

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

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