From b113c43959a22b28de277377718864ebcba7592c Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 15:58:45 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/co/jp/app/service/UserService.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index 21d2db1..7af06bd 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -2,7 +2,6 @@ package co.jp.app.service; import java.util.Collection; import java.util.Collections; -import java.util.List; import co.jp.app.dto.RegistrationDto; import co.jp.app.entity.UserEntity; @@ -17,8 +16,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import co.jp.app.entity.PetEntity; -import co.jp.app.repository.UploadRepository; import org.springframework.transaction.annotation.Transactional; @Service From b23ba3b92a3a955dcd1db65ece09e6afc83c4d8f Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 15:59:39 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/co/jp/app/service/UserService.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index f5b749d..7af06bd 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -1,15 +1,5 @@ package co.jp.app.service; -<<<<<<< HEAD -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; -import co.jp.app.repository.userRepository; -import jakarta.transaction.Transactional; - -======= import java.util.Collection; import java.util.Collections; @@ -27,28 +17,16 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; ->>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6 @Service public class UserService implements UserDetailsService { -<<<<<<< HEAD - private final userRepository userEntityRepository; - - @Autowired - public UserService(userRepository userEntityRepository, PasswordEncoder passwordEncoder ) - { - this.userEntityRepository = userEntityRepository; - this.passwordEncoder= passwordEncoder; - -======= private final UserRepository userRepository; private final PasswordEncoder passwordEncoder; public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder) { this.userRepository = userRepository; this.passwordEncoder = passwordEncoder; ->>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6 } @Transactional From 38e91f45b6838b27b12a3262ceb60f6a03a0fd2e Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 12 May 2025 16:02:18 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/co/jp/app/service/UserService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index 7af06bd..712b1fe 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -33,7 +33,7 @@ public class UserService implements UserDetailsService { public UserEntity registerNewUser(@NotNull RegistrationDto registrationDto) throws Exception { if (userRepository.existsByEmail(registrationDto.getEmail())) { - throw new Exception("エラー：メール：" + registrationDto.getEmail() + " はすでに登録されました。"); + throw new Exception("error: Email" + registrationDto.getEmail() + " had been used"); } UserEntity newUser = new UserEntity(); @@ -50,7 +50,7 @@ public class UserService implements UserDetailsService { UserEntity userEntity = userRepository.findByEmail(email) .orElseThrow(() -> new UsernameNotFoundException(email + " not found")); - Collection authorities = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")); // 示例：给所有用户一个ROLE_USER权限 + Collection authorities = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")); return new User( userEntity.getEmail(), @@ -59,7 +59,7 @@ public class UserService implements UserDetailsService { true, // accountNonExpired true, // credentialsNonExpired true, // accountNonLocked - authorities // 用户的权限集合 + authorities // role ); } }