Merge http://107.189.3.96:3000/Hans119/Dog-1

.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +1,4 @@
-activeProfiles=pom.xml
+activeProfiles=
 eclipse.preferences.version=1
 resolveWorkspaceProjects=true
 version=1

src/main/java/co/jp/app/common/ResultCode.java

@@ -28,7 +28,11 @@ public enum ResultCode {
     // 注册相关
     // USER_REGISTRATION_SUCCESS(3000, "用户注册成功"),
     USER_EMAIL_ALREADY_EXISTS(3001, "Email already exists"),
-    USER_EMAIL_NOT_VALID(3002, "Email is not valid"),
+
+    USER_USERNAME_ALREADY_EXISTS(3002, "Username"),
+
+    USER_EMAIL_NOT_VALID(3006, "Email is not valid"),
+
     USER_PASSWORD_TOO_SHORT(3003, "password too short"),
     USER_PASSWORD_TOO_WEAK(3004, "password too weak"),
     USER_REGISTRATION_FAILED(3005, "User registration failed"),

src/main/java/co/jp/app/repository/UserRepository.java

@@ -14,4 +14,8 @@ public interface UserRepository extends JpaRepository<UserEntity, Integer> {
 	boolean existsByEmail(String email);
 
 	Optional<UserEntity> findByEmail(String email);
+
+	boolean existsByName(String name);
+	
+	Optional<UserEntity> findByName(String name);
 }

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

@@ -3,8 +3,6 @@ package co.jp.app.service;
 import java.util.Collection;
 import java.util.Collections;
 
-import co.jp.app.common.ResultCode;
-import co.jp.app.exception.BusinessException;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -16,8 +14,10 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import co.jp.app.common.ResultCode;
 import co.jp.app.dto.RegistrationDto;
 import co.jp.app.entity.UserEntity;
+import co.jp.app.exception.BusinessException;
 import co.jp.app.repository.UserRepository;
 
 @Service
@@ -31,9 +31,18 @@ public class UserService implements UserDetailsService {
 		this.passwordEncoder = passwordEncoder;
 	}
 
-	@Transactional
+	
 	public UserEntity registerNewUser(@NotNull RegistrationDto registrationDto) throws BusinessException {
 
+		if (userRepository.existsByEmail(registrationDto.getEmail())) {
+			throw new BusinessException(ResultCode.USER_USERNAME_ALREADY_EXISTS,"error: Name" + registrationDto.getName() + " had been used");
+		}
+
+		//密码最短6位限制
+		if (registrationDto.getPassword() == null || registrationDto.getPassword().length() < 6) {
+			throw new BusinessException(ResultCode.USER_PASSWORD_TOO_SHORT);
+		}
+
 		UserEntity newUser = new UserEntity();
 		newUser.setName(registrationDto.getName());
 		newUser.setEmail(registrationDto.getEmail());
@@ -42,6 +51,8 @@ public class UserService implements UserDetailsService {
 		return userRepository.save(newUser);
 	}
 
+	
+	
 	@Override
 	@Transactional(readOnly = true)
 	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {

target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties

@@ -1,7 +0,0 @@
-#Generated by Maven Integration for Eclipse
-#Fri May 16 11:13:59 JST 2025
-m2e.projectLocation=C\:\\Users\\ichbi\\git\\Dog-1
-m2e.projectName=dog-1
-groupId=co.jp.app
-artifactId=dog-2
-version=0.0.1-SNAPSHOT