From 55997855f620a47c6faedbb6969d628751c66ba3 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 8 May 2025 11:26:28 +0900 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{AppConfig.java => SecurityConfig.java} | 2 +- .../co/jp/app/controller/LoginController.java | 4 --- .../java/co/jp/app/entity/UserEntity.java | 29 ++++++++++--------- .../co/jp/app/repository/ErraRepository.java | 2 +- .../co/jp/app/repository/UserRepository.java | 6 ++-- .../java/co/jp/app/service/ErraService.java | 6 ++-- .../java/co/jp/app/service/UserService.java | 7 +++-- 7 files changed, 29 insertions(+), 27 deletions(-) rename src/main/java/co/jp/app/config/{AppConfig.java => SecurityConfig.java} (93%) diff --git a/src/main/java/co/jp/app/config/AppConfig.java b/src/main/java/co/jp/app/config/SecurityConfig.java similarity index 93% rename from src/main/java/co/jp/app/config/AppConfig.java rename to src/main/java/co/jp/app/config/SecurityConfig.java index 17e5510..5a7fcb2 100644 --- a/src/main/java/co/jp/app/config/AppConfig.java +++ b/src/main/java/co/jp/app/config/SecurityConfig.java @@ -6,7 +6,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; @Configuration -public class AppConfig { +public class SecurityConfig { @Bean public PasswordEncoder passwordEncoder() { diff --git a/src/main/java/co/jp/app/controller/LoginController.java b/src/main/java/co/jp/app/controller/LoginController.java index 772ae55..c54bcbd 100644 --- a/src/main/java/co/jp/app/controller/LoginController.java +++ b/src/main/java/co/jp/app/controller/LoginController.java @@ -25,10 +25,6 @@ public class LoginController { public String getStatusByNameOrEmail() { String input="aaa"; - // input 可能是名字 或 email - UserEntity userByName = userService.getNameByEntity(input); - UserEntity userByEmail = userService.getEmailByEntity(input); - if (userByName == null && userByEmail == null) { return "全項目に入力してください"; } diff --git a/src/main/java/co/jp/app/entity/UserEntity.java b/src/main/java/co/jp/app/entity/UserEntity.java index 14525e8..204f175 100644 --- a/src/main/java/co/jp/app/entity/UserEntity.java +++ b/src/main/java/co/jp/app/entity/UserEntity.java @@ -1,23 +1,34 @@ package co.jp.app.entity; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; @Entity public class UserEntity { + @GeneratedValue(strategy = GenerationType.IDENTITY) @Id - private int ID; + private int id; private String name; + @Column(unique = true, nullable = false) private String email; + @Column(nullable = false) private String password; + public UserEntity() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + public String getName() { return name; } @@ -34,14 +45,6 @@ public class UserEntity { this.email = email; } - public int getID() { - return ID; - } - - public void setID(int iD) { - ID = iD; - } - public String getPassword() { return password; } diff --git a/src/main/java/co/jp/app/repository/ErraRepository.java b/src/main/java/co/jp/app/repository/ErraRepository.java index 5c18baf..18dc5ee 100644 --- a/src/main/java/co/jp/app/repository/ErraRepository.java +++ b/src/main/java/co/jp/app/repository/ErraRepository.java @@ -12,4 +12,4 @@ public interface ErraRepository extends JpaRepository{ public default ErrorEntity getById(@Param("id") int id) { return getById(id); } -} +} \ No newline at end of file diff --git a/src/main/java/co/jp/app/repository/UserRepository.java b/src/main/java/co/jp/app/repository/UserRepository.java index 973aa7a..8b97bb4 100644 --- a/src/main/java/co/jp/app/repository/UserRepository.java +++ b/src/main/java/co/jp/app/repository/UserRepository.java @@ -7,10 +7,12 @@ import org.springframework.data.repository.query.Param; import co.jp.app.entity.UserEntity; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository public interface UserRepository extends JpaRepository { - UserEntity getUserByEmail(@Param("email") String email); - + boolean existsByEmail(String email); + Optional findByEmail(String email); } \ No newline at end of file diff --git a/src/main/java/co/jp/app/service/ErraService.java b/src/main/java/co/jp/app/service/ErraService.java index aa267fb..239ab18 100644 --- a/src/main/java/co/jp/app/service/ErraService.java +++ b/src/main/java/co/jp/app/service/ErraService.java @@ -4,16 +4,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import co.jp.app.entity.ErrorEntity; -import co.jp.app.repository.erraRepository; +import co.jp.app.repository.ErraRepository; @Service public class ErraService { @Autowired -erraRepository erraDao; +ErraRepository erraRepository; public ErrorEntity getStatusById(int id) { - return erraDao.getById(id); + return erraRepository.getById(id); } } diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index d060899..78d0d25 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -1,6 +1,8 @@ package co.jp.app.service; +import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import co.jp.app.entity.UserEntity; @@ -11,12 +13,11 @@ import co.jp.app.repository.UserRepository; public class UserService { private final UserRepository userEntityRepository; - // private final PasswordEncoder passwordEncoder; // 注入密码编码器 @Autowired - public UserService(UserRepository userEntityRepository /*, PasswordEncoder passwordEncoder */) { + public UserService(UserRepository userEntityRepository, PasswordEncoder passwordEncoder ) { this.userEntityRepository = userEntityRepository; - // this.passwordEncoder = passwordEncoder; + this.passwordEncoder = passwordEncoder; } @Transactional // 整个注册过程应该是一个事务