reupload

src/main/java/co/jp/app/service/UserService.java

@@ -1,5 +1,6 @@
 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;
@@ -8,10 +9,33 @@ import co.jp.app.entity.UserEntity;
 import co.jp.app.repository.userRepository;
 import jakarta.transaction.Transactional;
 
+=======
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import co.jp.app.dto.RegistrationDto;
+import co.jp.app.entity.UserEntity;
+import co.jp.app.repository.UserRepository;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+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;
+>>>>>>> 34de018ef0606dec4f6de48c8cc5c3f073a1fdc6
 
 @Service
-public class UserService {
+public class UserService implements UserDetailsService {
 
+<<<<<<< HEAD
 	private final userRepository userEntityRepository;
 
 	@Autowired
@@ -20,35 +44,47 @@ public class UserService {
 		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 // 整个注册过程应该是一个事务
-	public UserEntity registerNewUser(String name, String email, String rawPassword) throws Exception {
-		// 1. 检查邮箱是否已被注册
-		if (userEntityRepository.existsByEmail(email)) {
-			throw new Exception("错误：该邮箱地址已被注册！"); // 或者自定义异常
+	@Transactional
+	public UserEntity registerNewUser(@NotNull RegistrationDto registrationDto) throws Exception {
+
+		if (userRepository.existsByEmail(registrationDto.getEmail())) {
+			throw new Exception("エラー：メール：" + registrationDto.getEmail() + " はすでに登録されました。");
 		}
 
-		// (可选) 检查用户名是否已被注册 (如果您有用户名字段)
-		// if (userEntityRepository.existsByUsername(username)) {
-		//     throw new Exception("错误：该用户名已被注册！");
-		// }
-
-		// 2. 创建新的 UserEntity 对象
 		UserEntity newUser = new UserEntity();
-		newUser.setName(name);
-		newUser.setEmail(email);
+		newUser.setName(registrationDto.getName());
+		newUser.setEmail(registrationDto.getEmail());
+		newUser.setPassword(passwordEncoder.encode(registrationDto.getPassword()));
 
-		// 3. 对密码进行哈希加密 (非常重要！)
-		// String hashedPassword = passwordEncoder.encode(rawPassword);
-		// newUser.setPassword(hashedPassword);
-		newUser.setPassword(rawPassword); // 实际项目中必须加密！这里为了简化先直接赋值
+		return userRepository.save(newUser);
+	}
 
-		// 4. 设置其他默认属性，例如账户状态、角色等 (如果需要)
-		// newUser.setActive(true);
-		// newUser.setRoles(...);
+	@Override
+	@Transactional(readOnly = true)
+	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
+		UserEntity userEntity = userRepository.findByEmail(email)
+				.orElseThrow(() -> new UsernameNotFoundException(email + " not found"));
 
-		// 5. 保存新用户到数据库
-		return userEntityRepository.save(newUser);
+		Collection<? extends GrantedAuthority> authorities = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")); // 示例：给所有用户一个ROLE_USER权限
+
+		return new User(
+				userEntity.getEmail(),
+				userEntity.getPassword(),
+				true,                // enabled
+				true,                       // accountNonExpired
+				true,                       // credentialsNonExpired
+				true,                       // accountNonLocked
+				authorities                 // 用户的权限集合
+		);
 	}
 }