Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda

# Conflicts:
#	book-rent/pom.xml
#	book-rent/src/main/java/com/example/demo/config/CustomAuthenticationFailureHandler.java
#	book-rent/src/main/java/com/example/demo/service/CustomUserDetailsService.java

book-rent/pom.xml

@@ -1,127 +0,0 @@
-<?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/common/LoginUser.java

@@ -1,31 +1,48 @@
 package com.example.demo.common;
 
-
-
 import java.io.Serializable;
 
 /** セッションに保持するログイン情報（社員ID・社員名・社員名よみ・メールアドレス・管理者フラグ） */
 public class LoginUser implements Serializable {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    private final Integer idEmployee;
+	private final Integer idEmployee;
-    private final String nmEmployee;
+	private final String nmEmployee;
-    private final String knEmployee;
+	private final String knEmployee;
-    private final String mailAddress;
+	private final String mailAddress;
-    private final String flgAdmin;
+	private final String flgAdmin;
 
-    public LoginUser(Integer idEmployee, String nmEmployee, String knEmployee, String mailAddress, String flgAdmin) {
+	public LoginUser(Integer idEmployee, String nmEmployee, String knEmployee, String mailAddress, String flgAdmin) {
-        this.idEmployee = idEmployee;
+		this.idEmployee = idEmployee;
-        this.nmEmployee = nmEmployee;
+		this.nmEmployee = nmEmployee;
-        this.knEmployee = knEmployee;
+		this.knEmployee = knEmployee;
-        this.mailAddress = mailAddress;
+		this.mailAddress = mailAddress;
-        this.flgAdmin = flgAdmin;
+		this.flgAdmin = flgAdmin;
-    }
+
+	}
+
+	public Integer getIdEmployee() {
+		return idEmployee;
+	}
+
+	public String getNmEmployee() {
+		return nmEmployee;
+	}
+
+	public String getKnEmployee() {
+		return knEmployee;
+	}
+
+	public String getMailAddress() {
+		return mailAddress;
+	}
+
+	public String getFlgAdmin() {
+		return flgAdmin;
+	}
+
+	public boolean isAdmin() {
+		return Const.ADMIN_YES.equals(flgAdmin);
+	}
 
-    public Integer getIdEmployee() { return idEmployee; }
-    public String getNmEmployee() { return nmEmployee; }
-    public String getKnEmployee() { return knEmployee; }
-    public String getMailAddress() { return mailAddress; }
-    public String getFlgAdmin() { return flgAdmin; }
-    public boolean isAdmin() { return Const.ADMIN_YES.equals(flgAdmin); }
 }

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,60 @@
+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 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()) {
+			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/LoginCheckInterceptor.java

@@ -34,4 +34,5 @@ public class LoginCheckInterceptor implements HandlerInterceptor {
         }
         return true;
     }
+    
 }

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/AdminBookController.java

@@ -20,106 +20,108 @@ import com.example.demo.service.BookAdminService;
 /** BOOK-02 書籍登録 / BOOK-03 書籍編集（管理者のみ：/admin/** で拒否）。入力 → 確認 → 完了 */
 @Controller
 public class AdminBookController {
-    private static final String NEW = "/admin/books/new";
+	private static final String NEW = "/admin/books/new";
-    private static final String EDIT = "/admin/books/edit";
+	private static final String EDIT = "/admin/books/edit";
 
-    private final BookAdminService bookAdminService;
+	private final BookAdminService bookAdminService;
 
-    public AdminBookController(BookAdminService bookAdminService) {
+	public AdminBookController(BookAdminService bookAdminService) {
-        this.bookAdminService = bookAdminService;
+		this.bookAdminService = bookAdminService;
-    }
+	}
 
-    // ===== BOOK-02 登録 =====
+	// ===== BOOK-02 登録 =====
-    @GetMapping(NEW)
+	@GetMapping(NEW)
-    public String newInput(Model model) {
+	public String newInput(Model model) {
-        return input(new BookForm(), List.of(), "書籍登録", NEW, model);
+		return input(new BookForm(), List.of(), "書籍登録", NEW, model);
-    }
+	}
 
-    @PostMapping(NEW + "/input")
+	@PostMapping(NEW + "/input")
-    public String newBack(@ModelAttribute("form") BookForm form, Model model) {
+	public String newBack(@ModelAttribute("form") BookForm form, Model model) {
-        return input(form, List.of(), "書籍登録", NEW, model);
+		return input(form, List.of(), "書籍登録", NEW, model);
-    }
+	}
 
-    @PostMapping(NEW + "/confirm")
+	@PostMapping(NEW + "/confirm")
-    public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
+	public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
-        List<String> errors = bookAdminService.validate(form);
+		List<String> errors = bookAdminService.validate(form);
-        if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model);
+		if (!errors.isEmpty())
-        return confirm("書籍登録", NEW, model);
+			return input(form, errors, "書籍登録", NEW, model);
-    }
+		return confirm("書籍登録", NEW, model);
+	}
 
-    @PostMapping(NEW + "/execute")
+	@PostMapping(NEW + "/execute")
-    public String newExecute(@ModelAttribute("form") BookForm form,
+	public String newExecute(@ModelAttribute("form") BookForm form,
-                             @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
-                             Model model, RedirectAttributes ra) {
+			Model model, RedirectAttributes ra) {
-        try {
+		try {
-            bookAdminService.register(form, admin);
+			bookAdminService.register(form, admin);
-        } catch (BusinessException e) {
+		} catch (BusinessException e) {
-            return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
+			return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
-        }
+		}
-        ra.addFlashAttribute("message", "書籍登録が完了しました。");
+		ra.addFlashAttribute("message", "書籍登録が完了しました。");
-        return "redirect:" + NEW + "/complete";
+		return "redirect:" + NEW + "/complete";
-    }
+	}
 
-    @GetMapping(NEW + "/complete")
+	@GetMapping(NEW + "/complete")
-    public String newComplete(Model model) {
+	public String newComplete(Model model) {
-        model.addAttribute("backUrl", "/books");
+		model.addAttribute("backUrl", "/books");
-        model.addAttribute("backLabel", "書籍一覧に戻る");
+		model.addAttribute("backLabel", "書籍一覧に戻る");
-        return "complete";
+		return "complete";
-    }
+	}
 
-    // ===== BOOK-03 編集 =====
+	// ===== BOOK-03 編集 =====
-    @GetMapping(EDIT)
+	@GetMapping(EDIT)
-    public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
+	public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
-        try {
+		try {
-            BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
+			BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
-            return input(form, List.of(), "書籍編集", EDIT, model);
+			return input(form, List.of(), "書籍編集", EDIT, model);
-        } catch (BusinessException e) {
+		} catch (BusinessException e) {
-            ra.addFlashAttribute("errorMessage", e.getMessage());
+			ra.addFlashAttribute("errorMessage", e.getMessage());
-            return "redirect:/books";
+			return "redirect:/books";
-        }
+		}
-    }
+	}
 
-    @PostMapping(EDIT + "/input")
+	@PostMapping(EDIT + "/input")
-    public String editBack(@ModelAttribute("form") BookForm form, Model model) {
+	public String editBack(@ModelAttribute("form") BookForm form, Model model) {
-        return input(form, List.of(), "書籍編集", EDIT, model);
+		return input(form, List.of(), "書籍編集", EDIT, model);
-    }
+	}
 
-    @PostMapping(EDIT + "/confirm")
+	@PostMapping(EDIT + "/confirm")
-    public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
+	public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
-        List<String> errors = bookAdminService.validate(form);
+		List<String> errors = bookAdminService.validate(form);
-        if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model);
+		if (!errors.isEmpty())
-        return confirm("書籍編集", EDIT, model);
+			return input(form, errors, "書籍編集", EDIT, model);
-    }
+		return confirm("書籍編集", EDIT, model);
+	}
 
-    @PostMapping(EDIT + "/execute")
+	@PostMapping(EDIT + "/execute")
-    public String editExecute(@ModelAttribute("form") BookForm form,
+	public String editExecute(@ModelAttribute("form") BookForm form,
-                              @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
-                              Model model, RedirectAttributes ra) {
+			Model model, RedirectAttributes ra) {
-        try {
+		try {
-            bookAdminService.update(form, admin);
+			bookAdminService.update(form, admin);
-        } catch (BusinessException e) {
+		} catch (BusinessException e) {
-            return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
+			return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
-        }
+		}
-        ra.addFlashAttribute("message", "書籍編集が完了しました。");
+		ra.addFlashAttribute("message", "書籍編集が完了しました。");
-        return "redirect:" + EDIT + "/complete";
+		return "redirect:" + EDIT + "/complete";
-    }
+	}
 
-    @GetMapping(EDIT + "/complete")
+	@GetMapping(EDIT + "/complete")
-    public String editComplete(Model model) {
+	public String editComplete(Model model) {
-        return newComplete(model);
+		return newComplete(model);
-    }
+	}
 
-    private String input(BookForm form, List<String> errors, String title, String base, Model model) {
+	private String input(BookForm form, List<String> errors, String title, String base, Model model) {
-        model.addAttribute("form", form);
+		model.addAttribute("form", form);
-        model.addAttribute("errors", errors);
+		model.addAttribute("errors", errors);
-        model.addAttribute("title", title);
+		model.addAttribute("title", title);
-        model.addAttribute("base", base);
+		model.addAttribute("base", base);
-        return "bookInput";
+		return "bookInput";
-    }
+	}
 
-    private String confirm(String title, String base, Model model) {
+	private String confirm(String title, String base, Model model) {
-        model.addAttribute("title", title);
+		model.addAttribute("title", title);
-        model.addAttribute("base", base);
+		model.addAttribute("base", base);
-        return "bookConfirm";
+		return "bookConfirm";
-    }
+	}
 }

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

@@ -1,39 +1,46 @@
 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;
+	private final BookService bookService;
 
-    public BookController(BookService bookService) {
+	public BookController(BookService bookService) {
-        this.bookService = bookService;
+		this.bookService = bookService;
-    }
+	}
 
-    /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
+	/** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
-    @GetMapping("/books")
+	@GetMapping("/books")
-    public String list(@RequestParam(defaultValue = "") String nmBook,
+	public String list(@RequestParam(defaultValue = "") String nmBook,
-                       @RequestParam(defaultValue = "") String publisher,
+			@RequestParam(defaultValue = "") String publisher,
-                       @RequestParam(defaultValue = "") String note,
+			@RequestParam(defaultValue = "") String note,
-                       Model model) {
+			@RequestParam(defaultValue = "0") int page,
-        model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
+			@RequestParam(defaultValue = "10") int size,
-        // 検索条件を保持
+			Model model) {
-        model.addAttribute("nmBook", nmBook);
+
-        model.addAttribute("publisher", publisher);
+		Page<BookCollection> bookPage = bookService.searchLendable(nmBook, publisher, note, page, size);
-        model.addAttribute("note", note);
+		List<Integer> pageNumbers = IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
-        return "bookList";
+
-    }
+		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";
+	}
 
 }

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

@@ -46,7 +46,8 @@ public class EmployeeController {
 	}
 
 	@PostMapping(NEW + "/confirm")
-	public String registConfirm(@ModelAttribute("form") EmployeeForm form, Model model) {
+	public String registConfirm(@ModelAttribute("form") EmployeeForm form,
+			Model model) {
 		List<String> errors = employeeService.validateRegist(form);
 		if (!errors.isEmpty())
 			return registView(form, errors, model);

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

@@ -1,72 +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")
+//package com.example.demo.controller;
-    public String login(@RequestParam(defaultValue = "") String mailAddress,
+// 
-                        @RequestParam(defaultValue = "") String password,
+// 
-                        HttpServletRequest request, Model model) {
+//import java.util.Optional;
-        String mail = mailAddress.trim();
+//
-        model.addAttribute("mailAddress", mail);   // 入力値を保持（パスワードは保持しない）
+//import jakarta.servlet.http.HttpServletRequest;
- 
+//import jakarta.servlet.http.HttpSession;
-        if (mail.isEmpty() || password.isEmpty()) {
+//
-            model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。");
+//import org.springframework.stereotype.Controller;
-            return "login";
+//import org.springframework.ui.Model;
-        }
+//import org.springframework.web.bind.annotation.GetMapping;
-        Optional<LoginUser> user = authService.authenticate(mail, password);
+//import org.springframework.web.bind.annotation.PostMapping;
-        if (user.isEmpty()) {
+//import org.springframework.web.bind.annotation.RequestParam;
-            // どちらが誤りかは分からない文言にする
+//
-            model.addAttribute("errorMessage", "メールアドレスまたはパスワードが正しくありません。");
+//import com.example.demo.common.Const;
-            return "login";
+//import com.example.demo.common.LoginUser;
-        }
+//import com.example.demo.service.AuthService;
-        // セッション固定化攻撃対策：古いセッションを破棄して新規発行
+// 
-        HttpSession old = request.getSession(false);
+///** AUTH-01：ログイン／ログアウト（login.html） */
-        if (old != null) {
+//@Controller
-            old.invalidate();
+//public class LoginController {
-        }
+//    private final AuthService authService;
-        request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get());
+// 
-        return "redirect:/menu";
+//    public LoginController(AuthService authService) {
-    }
+//        this.authService = authService;
- 
+//    }
-    @PostMapping("/logout")
+// 
-    public String logout(HttpSession session) {
+//    @GetMapping("/")
-        session.invalidate();
+//    public String root() {
-        return "redirect:/login";
+//        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/entity/Employee.java

@@ -105,4 +105,5 @@ public class Employee {
 	public void setDateUpdate(LocalDateTime v) {
 		this.dateUpdate = v;
 	}
+	
 }

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

@@ -1,5 +1,7 @@
 package com.example.demo.form;
 
+
+
 /** 社員登録・編集フォーム */
 public class EmployeeForm {
 	private Integer idEmployee;

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

@@ -1,8 +1,9 @@
 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;
@@ -22,10 +23,12 @@ 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("lending") String lending,
 			@Param("nm") String nm,
 			@Param("publisher") String publisher,
-			@Param("note") String note);
+			@Param("note") String note,
+			Pageable pageable);
 
 	/**
 	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。

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

@@ -10,4 +10,5 @@ public interface EmployeeRepository extends JpaRepository<Employee, Integer> {
 	Optional<Employee> findByMailAddressAndFlgRetirement(String mailAddress, String flgRetirement);
 
 	Optional<Employee> findByMailAddress(String mailAddress);
+	
 }

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

@@ -18,76 +18,84 @@ import com.example.demo.repository.BookCollectionRepository;
 
 @Service
 public class BookAdminService {
-    private final BookCollectionRepository bookRepository;
+	private final BookCollectionRepository bookRepository;
 
-    public BookAdminService(BookCollectionRepository bookRepository) {
+	public BookAdminService(BookCollectionRepository bookRepository) {
-        this.bookRepository = bookRepository;
+		this.bookRepository = bookRepository;
-    }
+	}
 
-    /** 入力チェック（ISBN必須13文字以内、書籍名必須50、よみ100、出版社50）。※ISBNを数字13桁に限定するかは要確認 */
+	/** 入力チェック（ISBN必須13文字以内、書籍名必須50、よみ100、出版社50）。※ISBNを数字13桁に限定するかは要確認 */
-    public List<String> validate(BookForm f) {
+	public List<String> validate(BookForm f) {
-        f.trim();
+		f.trim();
-        List<String> e = new ArrayList<>();
+		List<String> e = new ArrayList<>();
-        if (f.getIsbn().isEmpty()) e.add("ISBNを入力してください。");
+		if (f.getIsbn().isEmpty())
-        else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。");
+			e.add("ISBNを入力してください。");
-        if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。");
+		else if (f.getIsbn().length() > 13)
-        else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。");
+			e.add("ISBNは13文字以内で入力してください。");
-        if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。");
+		if (f.getNmBook().isEmpty())
-        if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。");
+			e.add("書籍名を入力してください。");
-        return e;
+		else if (f.getNmBook().length() > 50)
-    }
+			e.add("書籍名は50文字以内で入力してください。");
+		if (f.getKnBook().length() > 100)
+			e.add("書籍名よみは100文字以内で入力してください。");
+		else if (!f.getKnBook().matches("^[\\u3040-\\u309F]+$"))
+			e.add("書籍名よみはひらがなで入力してください");
+		if (f.getPublisher().length() > 50)
+			e.add("出版社は50文字以内で入力してください。");
+		return e;
+	}
 
-    @Transactional(readOnly = true)
+	@Transactional(readOnly = true)
-    public BookCollection find(Integer idBook) {
+	public BookCollection find(Integer idBook) {
-        return bookRepository.findById(idBook)
+		return bookRepository.findById(idBook)
-                .orElseThrow(() -> new BusinessException("対象の書籍が見つかりません。"));
+				.orElseThrow(() -> new BusinessException("対象の書籍が見つかりません。"));
-    }
+	}
 
-    public BookForm toForm(BookCollection b) {
+	public BookForm toForm(BookCollection b) {
-        BookForm f = new BookForm();
+		BookForm f = new BookForm();
-        f.setIdBook(b.getIdBook());
+		f.setIdBook(b.getIdBook());
-        f.setIsbn(b.getIsbn());
+		f.setIsbn(b.getIsbn());
-        f.setNmBook(b.getNmBook());
+		f.setNmBook(b.getNmBook());
-        f.setKnBook(b.getKnBook() == null ? "" : b.getKnBook());
+		f.setKnBook(b.getKnBook() == null ? "" : b.getKnBook());
-        f.setPublisher(b.getPublisher() == null ? "" : b.getPublisher());
+		f.setPublisher(b.getPublisher() == null ? "" : b.getPublisher());
-        f.setNote(b.getNote() == null ? "" : b.getNote());
+		f.setNote(b.getNote() == null ? "" : b.getNote());
-        return f;
+		return f;
-    }
+	}
 
-    /** 新規登録：貸出可として登録する。 */
+	/** 新規登録：貸出可として登録する。 */
-    @Transactional
+	@Transactional
-    public Integer register(BookForm f, LoginUser admin) {
+	public Integer register(BookForm f, LoginUser admin) {
-        check(f);
+		check(f);
-        BookCollection b = new BookCollection();
+		BookCollection b = new BookCollection();
-        apply(b, f);
+		apply(b, f);
-        b.setFlgLending(Const.LENDING_OK);
+		b.setFlgLending(Const.LENDING_OK);
-        b.setIdUpdate(admin.getIdEmployee());
+		b.setIdUpdate(admin.getIdEmployee());
-        b.setDateUpdate(LocalDateTime.now());
+		b.setDateUpdate(LocalDateTime.now());
-        return bookRepository.save(b).getIdBook();
+		return bookRepository.save(b).getIdBook();
-    }
+	}
 
-    /** 編集：書籍情報のみ更新する（貸出フラグは変更しない）。 */
+	/** 編集：書籍情報のみ更新する（貸出フラグは変更しない）。 */
-    @Transactional
+	@Transactional
-    public void update(BookForm f, LoginUser admin) {
+	public void update(BookForm f, LoginUser admin) {
-        check(f);
+		check(f);
-        BookCollection b = find(f.getIdBook());
+		BookCollection b = find(f.getIdBook());
-        apply(b, f);
+		apply(b, f);
-        b.setIdUpdate(admin.getIdEmployee());
+		b.setIdUpdate(admin.getIdEmployee());
-        b.setDateUpdate(LocalDateTime.now());
+		b.setDateUpdate(LocalDateTime.now());
-    }
+	}
 
-    private void check(BookForm f) {
+	private void check(BookForm f) {
-        List<String> errors = validate(f);
+		List<String> errors = validate(f);
-        if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
+		if (!errors.isEmpty())
-    }
+			throw new BusinessException(String.join(" ", errors));
+	}
 
-
+	private static void apply(BookCollection b, BookForm f) {
-    private static void apply(BookCollection b, BookForm f) {
+		b.setIsbn(f.getIsbn());
-        b.setIsbn(f.getIsbn());
+		b.setNmBook(f.getNmBook());
-        b.setNmBook(f.getNmBook());
+		b.setKnBook(f.getKnBook().isEmpty() ? null : f.getKnBook());
-        b.setKnBook(f.getKnBook().isEmpty() ? null : f.getKnBook());
+		b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher());
-        b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher());
+		b.setNote(f.getNote().isEmpty() ? null : f.getNote());
-        b.setNote(f.getNote().isEmpty() ? null : f.getNote());
+	}
-    }
 
 }

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

@@ -1,7 +1,7 @@
 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;
 
@@ -12,22 +12,24 @@ import com.example.demo.repository.BookCollectionRepository;
 /** BOOK-01：書籍検索 */
 @Service
 public class BookService {
-    private final BookCollectionRepository bookRepository;
+	private final BookCollectionRepository bookRepository;
 
-    public BookService(BookCollectionRepository bookRepository) {
+	public BookService(BookCollectionRepository bookRepository) {
-        this.bookRepository = bookRepository;
+		this.bookRepository = bookRepository;
-    }
+	}
 
-    /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
+	/** 貸出可の蔵書を検索する。全て未入力なら全件。 */
-    @Transactional(readOnly = true)
+	@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特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
+	/** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
-    static String normalize(String s) {
+	static String normalize(String s) {
-        if (s == null) return "";
+		if (s == null)
-        return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
+			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,365 @@ 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文字以内で入力してください。");
+	}
 
-    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/static/css/style.css

@@ -1,90 +1,153 @@
-body
+body {
-{font-family:
+	font-family:
-	"Meiryo","Hiragino Sans",sans-serif;
+		"Meiryo", "Hiragino Sans", sans-serif;
-	margin:0;color:#222;
+	margin: 0;
-	background:#f6f7f9}
+	color: #222;
-header.top
+	background: #f6f7f9
-{display:flex;
-	justify-content:space-between;
-	align-items:center;
-	background:#176a78;color:#fff;
-	padding:10px 20px
 }
-header.top form
+
-{display:inline;
+header.top {
-	margin:0}
+	display: flex;
-header.top .user
+	justify-content: space-between;
-{margin-right:12px
+	align-items: center;
+	background: #176a78;
+	color: #fff;
+	padding: 10px 20px
 }
-main
+
-{max-width:960px;
+header.top form {
-	margin:24px auto;
+	display: inline;
-	padding:0 16px
+	margin: 0
 }
-h1
+
-{font-size:20px
+header.top .user {
+	margin-right: 12px
 }
-.card
+
-{background:#fff;
+main {
-	border:1px solid #dde;
+	max-width: 960px;
-	border-radius:6px;
+	margin: 24px auto;
-	padding:20px;
+	padding: 0 16px
-	margin-bottom:16px
 }
-label
+
-{display:block;
+h1 {
-	margin:10px 0 4px;
+	font-size: 20px
-	font-weight:bold
 }
-input[type=text],input[type=password],input[type=email]
+
-{width:100%;
+.card {
-	max-width:360px;
+	background: #fff;
-	padding:6px;
+	border: 1px solid #dde;
-	box-sizing:border-box
+	border-radius: 6px;
+	padding: 20px;
+	margin-bottom: 16px
 }
-button,.btn
+
-{display:inline-block;
+label {
-	background:#176a78;
+	display: block;
-	color:#fff;border:0;
+	margin: 10px 0 4px;
-	border-radius:4px;
+	font-weight: bold
-	padding:7px 16px;
-	cursor:pointer;
-	text-decoration:none;
-	font-size:14px
 }
-button.sub,.btn.sub
+
-{background:#6b7b80
+input[type=text],
+input[type=password],
+input[type=email] {
+	width: 100%;
+	max-width: 360px;
+	padding: 6px;
+	box-sizing: border-box
 }
-.error
+
-{background:#fdecea;color:#b3261e;
+button,
-	border:1px solid #f5c2be;
+.btn {
-	padding:8px 12px;
+	display: inline-block;
-	border-radius:4px;
+	background: #176a78;
-	margin-bottom:12px
+	color: #fff;
+	border: 0;
+	border-radius: 4px;
+	padding: 7px 16px;
+	cursor: pointer;
+	text-decoration: none;
+	font-size: 14px
 }
-.info
+
-{background:#e8f4ea;
+button.sub,
-	color:#1b5e20;
+.btn.sub {
-	border:1px solid #bfdcc3;
+	background: #6b7b80
-	padding:8px 12px;
-	border-radius:4px;
-	margin-bottom:12px
 }
-table
+
-{border-collapse:collapse;
+.error {
-	width:100%;
+	background: #fdecea;
-	background:#fff
+	color: #b3261e;
+	border: 1px solid #f5c2be;
+	padding: 8px 12px;
+	border-radius: 4px;
+	margin-bottom: 12px
 }
-th,td
+
-{border:1px solid #dde;
+.info {
-	padding:6px 8px;
+	background: #e8f4ea;
-	text-align:left;
+	color: #1b5e20;
-	font-size:14px
+	border: 1px solid #bfdcc3;
+	padding: 8px 12px;
+	border-radius: 4px;
+	margin-bottom: 12px
 }
-th
+
-{background:#eaf4f6
+table {
+	border-collapse: collapse;
+	width: 100%;
+	background: #fff
 }
-.menu a
+
-{display:block;
+th,
-	margin:8px 0
+td {
+	border: 1px solid #dde;
+	padding: 6px 8px;
+	text-align: left;
+	font-size: 14px
 }
+
+th {
+	background: #eaf4f6
+}
+
+.menu a {
+	display: block;
+	margin: 8px 0
+}
+
+/* Responsive (ဖုန်းစခရင်သေးများတွင် အောက်သို့ ဆင်းသွားစေရန်) */
+@media (max-width: 600px) {
+	.login-container-flex {
+		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;
+	}
+}
+
+/* ページネーション */
+.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;
+}
+
+.page-number:hover {
+	background: #d5edf1;
+}

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

@@ -30,8 +30,8 @@
 					<td th:text="${r.isbn}"></td>
 				</tr>
 				<tr>
-				<th>書籍名</th>
+					<th>書籍名</th>
-				<td th:text="${r.nmBook}" style="width: 700px;"></td>
+					<td th:text="${r.nmBook}" style="width: 700px;"></td>
 				</tr>
 				<tr>
 					<th>出版社</th>
@@ -50,31 +50,34 @@
 					<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"
+			<div class="buttonSection" style="margin-top: 20px;">
-				style="display: inline;">
+
-				<button type="submit">承認</button>
+				<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
-			</form>
+					style="display: inline;">
+					<button type="submit">承認</button>
+				</form>
 
 
-			<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
+				<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
-				style="display: inline; margin-left: 10px;">
+					style="display: inline; margin-left: 10px;">
-				<button type="submit" class="sub">却下</button>
+					<button type="submit" class="sub">却下</button>
-			</form>
+				</form>
-		</div>
+				<a th:href="@{/admin/applications}" style="text-decoration: none; margin-left: 10px;">
+					<button type="button" class="sub">承認待ち一覧に戻る</button>
+				</a>
+			</div>
 
-		<br>
-		<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
 
-		<script>
+
-			function logoutSubmit() {
+
-				if (confirm("ログアウトしますか？")) {
+			<script>
-					window.location.href = "/logout";
+				function logoutSubmit() {
+					if (confirm("ログアウトしますか？")) {
+						window.location.href = "/logout";
+					}
 				}
-			}
+			</script>
-		</script>
 		</div>
 	</main>
 </body>

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

@@ -1,34 +1,39 @@
 <!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="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
-  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+		<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
-  <div class="card">
+		<div class="card">
-    <h2 th:text="${title}">書籍登録</h2>
+			<h2 th:text="${title}">書籍登録</h2>
-    <form th:action="@{${base + '/confirm'}}" method="post">
+			<form th:action="@{${base + '/confirm'}}" method="post">
-      <input type="hidden" name="idBook" th:value="${form.idBook}">
+				<input type="hidden" name="idBook" th:value="${form.idBook}">
-      <label for="isbn">ISBN（必須・13文字以内）</label>
+				<label for="isbn">ISBN（必須・13文字以内）</label>
-      <input type="text" id="isbn" name="isbn" th:value="${form.isbn}" maxlength="13">
+				<input type="text" id="isbn" name="isbn" th:value="${form.isbn}" maxlength="13">
-      <label for="nmBook">書籍名（必須・50文字以内）</label>
+				<label for="nmBook">書籍名（必須・50文字以内）</label>
-      <input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
+				<input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
-      <label for="knBook">書籍名よみ（100文字以内）</label>
+				<label for="knBook">書籍名よみ（100文字以内）</label>
-      <input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
+				<input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
-      <label for="publisher">出版社（50文字以内）</label>
+<!--				<span th:errors="${form.knBook}"></span>-->
-      <input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
+				<label for="publisher">出版社（50文字以内）</label>
-      <label for="note">特記事項</label>
+				<input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
-      <input type="text" id="note" name="note" th:value="${form.note}">
+				<label for="note">特記事項</label>
-      <p><button type="submit" th:text="${title} + '確認'">確認</button>
+				<input type="text" id="note" name="note" th:value="${form.note}">
-         <a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p>
+				<p><button type="submit" th:text="${title} + '確認'">確認</button>
-    </form>
+					<a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a>
-  </div>
+				</p>
-</main>
+			</form>
+		</div>
+	</main>
 </body>
-</html>
+
+</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,21 @@
 					</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: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>
+</html>

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

@@ -1,16 +1,22 @@
+
 <!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>
+    <title>社員登録確認</title>
     <link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
+
 <body>
+
     <!-- 共通ヘッダー -->
     <div th:replace="~{fragments/header :: header}"></div>
+
     <main>
-        <h1>社員登録確認</h1>
+        <h2>社員登録確認</h2>
+
         <!-- エラーメッセージ -->
         <div class="error"
              th:if="${errors != null and !errors.isEmpty()}">
@@ -18,62 +24,78 @@
                th:text="${error}">
             </p>
         </div>
+
+        <!-- 登録内容確認 -->
         <div class="card">
+
             <p>以下の内容で登録します。内容を確認してください。</p>
-            <!-- 登録ボタン -->
+
             <form th:action="@{/admin/employees/new/execute}"
                   th:object="${form}"
                   method="post">
+
+                <!-- 登録内容一覧 -->
                 <table>
-                    <tr>
+                    <tbody>
-                        <th>社員名</th>
+                        <tr>
-                        <td th:text="*{nmEmployee}"></td>
+                            <th>社員名</th>
-                    </tr>
+                            <td th:text="*{nmEmployee}"></td>
-                    <tr>
+                        </tr>
-                        <th>社員名よみ</th>
+
-                        <td th:text="*{knEmployee}"></td>
+                        <tr>
-                    </tr>
+                            <th>社員名よみ</th>
-                    <tr>
+                            <td th:text="*{knEmployee}"></td>
-                        <th>メールアドレス</th>
+                        </tr>
-                        <td th:text="*{mailAddress}"></td>
+
-                    </tr>
+                        <tr>
-                    <tr>
+                            <th>メールアドレス</th>
-                        <th>パスワード</th>
+                            <td th:text="*{mailAddress}"></td>
-                        <td>********</td>
+                        </tr>
-                    </tr>
+
-                    <tr>
+                        <tr>
-                        <th>権限</th>
+                            <th>パスワード</th>
-                        <td th:text="*{flgAdmin == '1' ? '管理者' : '一般'}"></td>
+                            <td>********</td>
-                    </tr>
+                        </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 class="actions">
+
+                <!-- ボタン：左に戻る、右に登録 -->
+<!--                <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>
-                </div>
+					</p>
-            </form>
+			
-            <!-- 入力画面へ戻る -->
+
-            <form th:action="@{/admin/employees/new/input}"
-                  th:object="${form}"
-                  method="post">
-                <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 class="back-link">
-                    <button type="submit" class="sub">
-                        社員情報入力に戻る
-                    </button>
-                </div>
             </form>
+
         </div>
     </main>
+
 </body>
 </html>

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

@@ -1,69 +1,118 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
+
 <head>
-    <meta charset="UTF-8">
+	<meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <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>
+
-        <h2>社員登録</h2>
+	<main>
-        <!-- 入力エラー表示 -->
+		<h2>社員登録</h2>
-        <div th:if="${errors != null and !errors.isEmpty()}">
+
-            <p th:each="error : ${errors}"
+		<!-- 入力エラー表示 -->
-               th:text="${error}"
+		<div class="error" th:if="${errors != null and !errors.isEmpty()}">
-               class="error">
+			<p th:each="error : ${errors}" th:text="${error}">
-            </p>
+			</p>
-        </div>
+		</div>
-        <form th:action="@{/admin/employees/new/confirm}"
+
-              th:object="${form}"
+		<!-- 社員登録フォーム -->
-              method="post">
+		<div class="card">
-            <div>
+
-                <label for="nmEmployee">社員名</label>
+			<form th:action="@{/admin/employees/new/confirm}" th:object="${form}" method="post">
-                <input type="text"
+
-                       id="nmEmployee"
+				<!-- 社員名 -->
-                       th:field="*{nmEmployee}">
+				<div>
-            </div>
+					<label for="nmEmployee">社員名</label>
-            <div>
+					<input type="text" id="nmEmployee" th:field="*{nmEmployee}">
-                <label for="knEmployee">社員名よみ</label>
+				</div>
-                <input type="text"
+
-                       id="knEmployee"
+				<!-- 社員名よみ -->
-                       th:field="*{knEmployee}">
+				<div>
-            </div>
+					<label for="knEmployee">社員名よみ</label>
-            <div>
+					<input type="text" id="knEmployee" th:field="*{knEmployee}">
-                <label for="mailAddress">メールアドレス</label>
+					<span th:errors="*{knEmployee}"></span>
-                <input type="email"
+				</div>
-                       id="mailAddress"
+
-                       th:field="*{mailAddress}">
+				<!-- メールアドレス -->
-            </div>
+				<div>
-            <div>
+					<label for="mailAddress">メールアドレス</label>
-                <label for="password">パスワード</label>
+					<input type="email" id="mailAddress" th:field="*{mailAddress}">
-                <input type="password"
+				</div>
-                       id="password"
+
-                       th:field="*{password}">
+				<!-- パスワード -->
-            </div>
+				<div>
-            <fieldset>
+					<label for="password">パスワード</label>
-                <legend>権限</legend>
+					<input type="password" id="password" th:field="*{password}">
-                <label>
+				</div>
-                    <input type="radio"
+				<label for="flgAdmin">管理者フラグ</label>
-                           th:field="*{flgAdmin}"
+				<select id="flgAdmin" name="flgAdmin">
-                           value="0">
+					<option value="0" th:selected="${form.flgAdmin == '0'}">0：一般</option>
-                    一般
+					<option value="1" th:selected="${form.flgAdmin == '1'}">1：管理者</option>
-                </label>
+				</select>
-                <label>
+				<p><a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
-                    <input type="radio"
+					<button type="submit">登録確認</button>
-                           th:field="*{flgAdmin}"
+				</p>
-                           value="1">
+
-                    管理者
+				<!-- 権限：枠線なし・横並び -->
-                </label>
+				<!--                <div style="border: none;-->
-            </fieldset>
+				<!--                            display: flex;-->
-            <button type="submit">登録確認</button>
+				<!--                            flex-direction: row;-->
-        </form>
+				<!--                            align-items: center;-->
-        <a th:href="@{/menu}">メニューへ戻る</a>
+				<!--                            gap: 25px;-->
-    </main>
+				<!--                            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>