diff --git a/bin b/bin new file mode 160000 index 0000000..aa8d827 --- /dev/null +++ b/bin @@ -0,0 +1 @@ +Subproject commit aa8d8275e813ce85bae72bbd483c7678a7ab785e diff --git a/src/main/java/co/jp/app/controller/DownloadController.java b/src/main/java/co/jp/app/controller/DownloadController.java new file mode 100644 index 0000000..cf5f805 --- /dev/null +++ b/src/main/java/co/jp/app/controller/DownloadController.java @@ -0,0 +1,23 @@ +package co.jp.app.controller; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import co.jp.app.service.PetService; + +@Controller +public class DownloadController { + @Autowired + private PetService service; + + @GetMapping("/api/dogs/pet") + public String downloadById(@RequestParam List id) { + service.getPetByID(id); + return "pet"; + } +} + diff --git a/src/main/java/co/jp/app/controller/UploadController.java b/src/main/java/co/jp/app/controller/UploadController.java index 1ef704a..85c45e9 100644 --- a/src/main/java/co/jp/app/controller/UploadController.java +++ b/src/main/java/co/jp/app/controller/UploadController.java @@ -9,19 +9,20 @@ import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import co.jp.app.entity.PetEntity; +import co.jp.app.service.UploadService; @CrossOrigin("http://192.168.1.50:5173") @Controller public class UploadController { @Autowired - //private UploadService service; + private UploadService service; @PostMapping("/api/dogs/upload") public String upload() { List list = new ArrayList(); - //service.saveAll(list); + service.saveAllPets(list); return "upload"; diff --git a/src/main/java/co/jp/app/repository/DownloadRepository.java b/src/main/java/co/jp/app/repository/DownloadRepository.java new file mode 100644 index 0000000..a7280ed --- /dev/null +++ b/src/main/java/co/jp/app/repository/DownloadRepository.java @@ -0,0 +1,17 @@ +package co.jp.app.repository; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; + +import co.jp.app.entity.PetEntity; + +public interface DownloadRepository extends JpaRepository{ + + @Override + default List findAllById(Iterable id) { + return findAllById(id); + + } + +} diff --git a/src/main/java/co/jp/app/service/DownloadService.java b/src/main/java/co/jp/app/service/DownloadService.java new file mode 100644 index 0000000..e5f3a57 --- /dev/null +++ b/src/main/java/co/jp/app/service/DownloadService.java @@ -0,0 +1,23 @@ +package co.jp.app.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import co.jp.app.entity.PetEntity; +import co.jp.app.repository.DownloadRepository; + +@Service +public class DownloadService { + + @Autowired + private DownloadRepository downloadDao; + + public List getPetByID(Iterable id) { + + return downloadDao.findAllById(id); + + } +} + diff --git a/src/main/java/co/jp/app/service/UploadService.java b/src/main/java/co/jp/app/service/UploadService.java new file mode 100644 index 0000000..d39eba0 --- /dev/null +++ b/src/main/java/co/jp/app/service/UploadService.java @@ -0,0 +1,21 @@ +package co.jp.app.service; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import co.jp.app.entity.PetEntity; +import co.jp.app.repository.UploadRepository; + +@Service +public class UploadService { + + @Autowired + private UploadRepository uploadDao; + + public List saveAllPets(List entities) { + return uploadDao.saveAll(entities); + } + +} diff --git a/src/main/java/co/jp/app/service/UserService.java b/src/main/java/co/jp/app/service/UserService.java index 7af06bd..f5b749d 100644 --- a/src/main/java/co/jp/app/service/UserService.java +++ b/src/main/java/co/jp/app/service/UserService.java @@ -1,5 +1,15 @@ 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; @@ -17,16 +27,28 @@ 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 diff --git a/target/classes/.gitignore b/target/classes/.gitignore deleted file mode 100644 index 9bd6d3a..0000000 --- a/target/classes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/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 5f2c654..132537c 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 11:38:52 JST 2025 -m2e.projectLocation=E\:\\jugyo\\asciimg-master\\Dog-1 +#Mon May 12 14:19:16 JST 2025 +m2e.projectLocation=C\:\\Users\\ichbi\\OneDrive\\\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\\dog-1 m2e.projectName=dog-1 groupId=co.jp.app artifactId=dog-2 diff --git a/target/classes/application.properties b/target/classes/application.properties index 618861c..cc45d08 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -10,4 +10,4 @@ spring.datasource.password=coder spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver jwt.secret=wM7Pz4BxvZ5NcLaBpgJm0eRQ5ztc3W5+OPH0E7g3gcQ= -jwt.token-expiration-ms==900000 \ No newline at end of file +jwt.token-expiration-ms=900000 \ No newline at end of file diff --git a/target/classes/co/jp/app/common/ApiResponse.class b/target/classes/co/jp/app/common/ApiResponse.class new file mode 100644 index 0000000..906a064 Binary files /dev/null and b/target/classes/co/jp/app/common/ApiResponse.class differ diff --git a/target/classes/co/jp/app/config/CorsConfig.class b/target/classes/co/jp/app/config/CorsConfig.class new file mode 100644 index 0000000..e3e0bf6 Binary files /dev/null and b/target/classes/co/jp/app/config/CorsConfig.class differ diff --git a/target/classes/co/jp/app/config/security/SecurityConfig.class b/target/classes/co/jp/app/config/security/SecurityConfig.class new file mode 100644 index 0000000..fb3a4d7 Binary files /dev/null and b/target/classes/co/jp/app/config/security/SecurityConfig.class differ diff --git a/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class b/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class new file mode 100644 index 0000000..4d41360 Binary files /dev/null and b/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class differ diff --git a/target/classes/co/jp/app/controller/DownloadController.class b/target/classes/co/jp/app/controller/DownloadController.class new file mode 100644 index 0000000..74a19d8 Binary files /dev/null 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 new file mode 100644 index 0000000..92f642b Binary files /dev/null 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 new file mode 100644 index 0000000..90fe869 Binary files /dev/null and b/target/classes/co/jp/app/controller/uploadController.class differ diff --git a/target/classes/co/jp/app/dto/LoginDto.class b/target/classes/co/jp/app/dto/LoginDto.class new file mode 100644 index 0000000..04f8554 Binary files /dev/null and b/target/classes/co/jp/app/dto/LoginDto.class differ diff --git a/target/classes/co/jp/app/dto/RegistrationDto.class b/target/classes/co/jp/app/dto/RegistrationDto.class new file mode 100644 index 0000000..2b384f4 Binary files /dev/null and b/target/classes/co/jp/app/dto/RegistrationDto.class differ diff --git a/target/classes/co/jp/app/repository/DownloadRepository.class b/target/classes/co/jp/app/repository/DownloadRepository.class new file mode 100644 index 0000000..eaa4357 Binary files /dev/null and b/target/classes/co/jp/app/repository/DownloadRepository.class differ diff --git a/target/classes/co/jp/app/repository/ErrRepository.class b/target/classes/co/jp/app/repository/ErrRepository.class new file mode 100644 index 0000000..c8802c9 Binary files /dev/null and b/target/classes/co/jp/app/repository/ErrRepository.class differ diff --git a/target/classes/co/jp/app/repository/uploadRepository.class b/target/classes/co/jp/app/repository/uploadRepository.class new file mode 100644 index 0000000..0bd85a9 Binary files /dev/null and b/target/classes/co/jp/app/repository/uploadRepository.class differ diff --git a/target/classes/co/jp/app/repository/userRepository.class b/target/classes/co/jp/app/repository/userRepository.class new file mode 100644 index 0000000..bda154e Binary files /dev/null and b/target/classes/co/jp/app/repository/userRepository.class differ diff --git a/target/classes/co/jp/app/service/DownloadService.class b/target/classes/co/jp/app/service/DownloadService.class new file mode 100644 index 0000000..bb45e59 Binary files /dev/null and b/target/classes/co/jp/app/service/DownloadService.class differ diff --git a/target/classes/co/jp/app/service/JwtService.class b/target/classes/co/jp/app/service/JwtService.class new file mode 100644 index 0000000..3ebabfa Binary files /dev/null and b/target/classes/co/jp/app/service/JwtService.class differ diff --git a/target/classes/co/jp/app/service/UploadService.class b/target/classes/co/jp/app/service/UploadService.class new file mode 100644 index 0000000..7cbc179 Binary files /dev/null and b/target/classes/co/jp/app/service/UploadService.class differ diff --git a/target/classes/co/jp/app/service/erraService.class b/target/classes/co/jp/app/service/erraService.class new file mode 100644 index 0000000..6e7e760 Binary files /dev/null and b/target/classes/co/jp/app/service/erraService.class differ diff --git a/target/classes/co/jp/app/service/userService.class b/target/classes/co/jp/app/service/userService.class new file mode 100644 index 0000000..00b78d2 Binary files /dev/null and b/target/classes/co/jp/app/service/userService.class differ