diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 839d647..99f26c0 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/src/main/java/co/jp/app/controller/DownloadController.java b/src/main/java/co/jp/app/controller/DownloadController.java index cf5f805..6f1bdbf 100644 --- a/src/main/java/co/jp/app/controller/DownloadController.java +++ b/src/main/java/co/jp/app/controller/DownloadController.java @@ -14,10 +14,10 @@ public class DownloadController { @Autowired private PetService service; - @GetMapping("/api/dogs/pet") + @GetMapping("/api/dogs/download") public String downloadById(@RequestParam List id) { service.getPetByID(id); - return "pet"; + return "download"; } } diff --git a/src/main/java/co/jp/app/repository/UserRepository.java b/src/main/java/co/jp/app/repository/UserRepository.java index 8b97bb4..bbadc8f 100644 --- a/src/main/java/co/jp/app/repository/UserRepository.java +++ b/src/main/java/co/jp/app/repository/UserRepository.java @@ -1,13 +1,12 @@ package co.jp.app.repository; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.repository.query.Param; +import java.util.Optional; -import co.jp.app.entity.UserEntity; +import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import java.util.Optional; +import co.jp.app.entity.UserEntity; @Repository public interface UserRepository extends JpaRepository { diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index 712b1fe..5dbfd72 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -3,9 +3,6 @@ package co.jp.app.service; import java.util.Collection; import java.util.Collections; -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; @@ -15,9 +12,12 @@ 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 org.springframework.transaction.annotation.Transactional; +import co.jp.app.dto.RegistrationDto; +import co.jp.app.entity.UserEntity; +import co.jp.app.repository.UserRepository; + @Service public class UserService implements UserDetailsService { @@ -50,16 +50,17 @@ public class UserService implements UserDetailsService { UserEntity userEntity = userRepository.findByEmail(email) .orElseThrow(() -> new UsernameNotFoundException(email + " not found")); - Collection authorities = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")); + Collection authorities = Collections + .singletonList(new SimpleGrantedAuthority("ROLE_USER")); return new User( userEntity.getEmail(), userEntity.getPassword(), - true, // enabled - true, // accountNonExpired - true, // credentialsNonExpired - true, // accountNonLocked - authorities // role + true, // enabled + true, // accountNonExpired + true, // credentialsNonExpired + true, // accountNonLocked + authorities // role ); } -} +} \ No newline at end of file diff --git a/target/classes/.gitignore b/target/classes/.gitignore new file mode 100644 index 0000000..09b187f --- /dev/null +++ b/target/classes/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/co/ diff --git a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties index 132537c..f3135a6 100644 --- a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties +++ b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties @@ -1,6 +1,6 @@ #Generated by Maven Integration for Eclipse -#Mon May 12 14:19:16 JST 2025 -m2e.projectLocation=C\:\\Users\\ichbi\\OneDrive\\\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\\dog-1 +#Mon May 12 15:57:02 JST 2025 +m2e.projectLocation=C\:\\Users\\Administrator\\git\\Dog-1 m2e.projectName=dog-1 groupId=co.jp.app artifactId=dog-2 diff --git a/target/classes/co/jp/app/common/ApiResponse.class b/target/classes/co/jp/app/common/ApiResponse.class index 906a064..064e11b 100644 Binary files a/target/classes/co/jp/app/common/ApiResponse.class and b/target/classes/co/jp/app/common/ApiResponse.class differ diff --git a/target/classes/co/jp/app/config/security/SecurityConfig.class b/target/classes/co/jp/app/config/security/SecurityConfig.class index fb3a4d7..d5567d7 100644 Binary files a/target/classes/co/jp/app/config/security/SecurityConfig.class and b/target/classes/co/jp/app/config/security/SecurityConfig.class differ diff --git a/target/classes/co/jp/app/controller/DownloadController.class b/target/classes/co/jp/app/controller/DownloadController.class index 74a19d8..7c0199e 100644 Binary files a/target/classes/co/jp/app/controller/DownloadController.class and b/target/classes/co/jp/app/controller/DownloadController.class differ diff --git a/target/classes/co/jp/app/controller/UserController.class b/target/classes/co/jp/app/controller/UserController.class index 92f642b..6004553 100644 Binary files a/target/classes/co/jp/app/controller/UserController.class and b/target/classes/co/jp/app/controller/UserController.class differ diff --git a/target/classes/co/jp/app/controller/uploadController.class b/target/classes/co/jp/app/controller/uploadController.class deleted file mode 100644 index 90fe869..0000000 Binary files a/target/classes/co/jp/app/controller/uploadController.class and /dev/null differ diff --git a/target/classes/co/jp/app/repository/uploadRepository.class b/target/classes/co/jp/app/repository/uploadRepository.class deleted file mode 100644 index 0bd85a9..0000000 Binary files a/target/classes/co/jp/app/repository/uploadRepository.class and /dev/null differ diff --git a/target/classes/co/jp/app/repository/userRepository.class b/target/classes/co/jp/app/repository/userRepository.class deleted file mode 100644 index bda154e..0000000 Binary files a/target/classes/co/jp/app/repository/userRepository.class and /dev/null differ diff --git a/target/classes/co/jp/app/service/userService.class b/target/classes/co/jp/app/service/userService.class deleted file mode 100644 index 00b78d2..0000000 Binary files a/target/classes/co/jp/app/service/userService.class and /dev/null differ