From d6e5ba3f9faf46bac25951310ad63e7d07e852aa Mon Sep 17 00:00:00 2001 From: "DESKTOP-304U2MR\\r2com" Date: Thu, 21 Nov 2024 09:57:20 +0900 Subject: [PATCH 1/7] feat : eureka on --- build.gradle | 18 +++++++++--------- src/main/java/com/users/UsersApplication.java | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index e23ad21..6cd906e 100644 --- a/build.gradle +++ b/build.gradle @@ -23,9 +23,9 @@ repositories { mavenCentral() } -//ext { -// set('springCloudVersion', "2023.0.3") -//} +ext { + set('springCloudVersion', "2023.0.3") +} dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' @@ -49,7 +49,7 @@ dependencies { // gateway, eureka-client 의존성 추가 implementation 'org.springframework.cloud:spring-cloud-starter-gateway' -// implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' + implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' @@ -58,11 +58,11 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } -//dependencyManagement { -// imports { -// mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" -// } -//} +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" + } +} tasks.named('test') { useJUnitPlatform() diff --git a/src/main/java/com/users/UsersApplication.java b/src/main/java/com/users/UsersApplication.java index 59d2d88..a0e1ff0 100644 --- a/src/main/java/com/users/UsersApplication.java +++ b/src/main/java/com/users/UsersApplication.java @@ -1,8 +1,8 @@ package com.users; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -//import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -//@EnableDiscoveryClient +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +@EnableDiscoveryClient @SpringBootApplication public class UsersApplication { public static void main(String[] args) { From 6db577c61f114820d9fdc2e26a4ab5e996eefe9f Mon Sep 17 00:00:00 2001 From: "DESKTOP-304U2MR\\r2com" Date: Thu, 21 Nov 2024 15:53:43 +0900 Subject: [PATCH 2/7] =?UTF-8?q?fix=20:=20api/user=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/users/user/controller/UserOpenApiController.java | 3 +-- src/main/java/com/users/user/service/UserService.java | 2 ++ src/main/resources/application.YAML | 2 +- src/main/resources/application.properties | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/users/user/controller/UserOpenApiController.java b/src/main/java/com/users/user/controller/UserOpenApiController.java index 61e2f5c..a3fcdd1 100644 --- a/src/main/java/com/users/user/controller/UserOpenApiController.java +++ b/src/main/java/com/users/user/controller/UserOpenApiController.java @@ -13,8 +13,7 @@ @RequiredArgsConstructor @RestController -@RequestMapping("/open-api") -@CrossOrigin(origins="http://localhost:3000", allowedHeaders="*") +@RequestMapping("/open-api/user") public class UserOpenApiController { private final UserService userService; diff --git a/src/main/java/com/users/user/service/UserService.java b/src/main/java/com/users/user/service/UserService.java index 88a0660..f1289e0 100644 --- a/src/main/java/com/users/user/service/UserService.java +++ b/src/main/java/com/users/user/service/UserService.java @@ -39,6 +39,8 @@ public User register(User user) { user.setNickname(user.getNickname() != null ? user.getNickname() : user.getUsername()); user.setCreatedAt(LocalDateTime.now()); + + System.out.println(user.getUsername()+"//"+encodedPassword+"//"); return userRepository.save(user); } diff --git a/src/main/resources/application.YAML b/src/main/resources/application.YAML index 64d6381..2ec475f 100644 --- a/src/main/resources/application.YAML +++ b/src/main/resources/application.YAML @@ -11,7 +11,7 @@ eureka: register-with-eureka: true fetch-registry: true service-url: - defaultZone: http://192.168.0.153:8088/eureka + defaultZone: http://localhost:8088/eureka instance: instance-id: USERS:8080 # 고정 값으로 설정 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 16b26fb..8207f64 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,7 +14,7 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver #spring.datasource.username=${USER_DB_USERNAME} #spring.datasource.password=${USER_DB_PASSWORD} -spring.datasource.url=jdbc:mariadb://localhost:3306/users +spring.datasource.url=jdbc:mariadb://localhost:3307/users spring.datasource.username=root spring.datasource.password=1234 From f8b5f6c378b58a4d8fb33476131f8a003673e360 Mon Sep 17 00:00:00 2001 From: "DESKTOP-304U2MR\\r2com" Date: Fri, 22 Nov 2024 11:27:57 +0900 Subject: [PATCH 3/7] =?UTF-8?q?fix=20:=20Accpeted=20=EC=98=A4=ED=83=80?= =?UTF-8?q?=EB=A5=BC=20Accepted=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/users/user/db/User.java | 2 +- src/main/java/com/users/user/dto/UserDto.java | 2 +- src/main/java/com/users/user/dto/UserMapper.java | 4 ++-- src/main/java/com/users/user/dto/UserResponse.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/users/user/db/User.java b/src/main/java/com/users/user/db/User.java index 1b5420d..9bc7833 100644 --- a/src/main/java/com/users/user/db/User.java +++ b/src/main/java/com/users/user/db/User.java @@ -45,5 +45,5 @@ public class User { private LocalDateTime createdAt; @UpdateTimestamp @Column - private LocalDateTime lastAccpetedAt; + private LocalDateTime LastAcceptedAt; } \ No newline at end of file diff --git a/src/main/java/com/users/user/dto/UserDto.java b/src/main/java/com/users/user/dto/UserDto.java index 20610a3..c9c5f48 100644 --- a/src/main/java/com/users/user/dto/UserDto.java +++ b/src/main/java/com/users/user/dto/UserDto.java @@ -24,5 +24,5 @@ public class UserDto { private String email; private UserRole role; private LocalDateTime createdat; - private LocalDateTime lastAccpetedat; + private LocalDateTime lastAcceptedat; } \ No newline at end of file diff --git a/src/main/java/com/users/user/dto/UserMapper.java b/src/main/java/com/users/user/dto/UserMapper.java index 77e2dfa..e9736fd 100644 --- a/src/main/java/com/users/user/dto/UserMapper.java +++ b/src/main/java/com/users/user/dto/UserMapper.java @@ -57,7 +57,7 @@ public UserResponse toResponse(User user) { .email(user.getEmail()) .role(user.getRole()) .createdAt(user.getCreatedAt()) - .lastAccpetedAt(user.getLastAccpetedAt()) + .lastAccpetedAt(user.getLastAcceptedAt()) .build()) .orElseThrow(() -> new ApiException(ErrorCode.NULL_POINT, "UserEntity Null")); } @@ -77,7 +77,7 @@ public UserResponse toResponse(UserResponse updatedEntity) { .email(user.getEmail()) .role(user.getRole()) .createdAt(user.getCreatedAt()) - .lastAccpetedAt(user.getLastAccpetedAt()) + .lastAccpetedAt(user.getLastAcceptedAt()) .build()) .orElseThrow(() -> new ApiException(ErrorCode.NULL_POINT, "UserEntity Null")); } diff --git a/src/main/java/com/users/user/dto/UserResponse.java b/src/main/java/com/users/user/dto/UserResponse.java index 1a1d720..1a33089 100644 --- a/src/main/java/com/users/user/dto/UserResponse.java +++ b/src/main/java/com/users/user/dto/UserResponse.java @@ -22,5 +22,5 @@ public class UserResponse { private String email; private UserRole role; private LocalDateTime createdAt; - private LocalDateTime lastAccpetedAt; + private LocalDateTime LastAcceptedAt; } From 813ffeef1ef0889276c0161811751dea1013cd7c Mon Sep 17 00:00:00 2001 From: "DESKTOP-304U2MR\\r2com" Date: Fri, 22 Nov 2024 11:31:10 +0900 Subject: [PATCH 4/7] =?UTF-8?q?fix=20:=20Accpeted=20=EC=98=A4=ED=83=80?= =?UTF-8?q?=EB=A5=BC=20Accepted=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/users/user/dto/UserMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/users/user/dto/UserMapper.java b/src/main/java/com/users/user/dto/UserMapper.java index e9736fd..065ff49 100644 --- a/src/main/java/com/users/user/dto/UserMapper.java +++ b/src/main/java/com/users/user/dto/UserMapper.java @@ -57,7 +57,7 @@ public UserResponse toResponse(User user) { .email(user.getEmail()) .role(user.getRole()) .createdAt(user.getCreatedAt()) - .lastAccpetedAt(user.getLastAcceptedAt()) + .LastAcceptedAt(user.getLastAcceptedAt()) .build()) .orElseThrow(() -> new ApiException(ErrorCode.NULL_POINT, "UserEntity Null")); } @@ -77,7 +77,7 @@ public UserResponse toResponse(UserResponse updatedEntity) { .email(user.getEmail()) .role(user.getRole()) .createdAt(user.getCreatedAt()) - .lastAccpetedAt(user.getLastAcceptedAt()) + .LastAcceptedAt(user.getLastAcceptedAt()) .build()) .orElseThrow(() -> new ApiException(ErrorCode.NULL_POINT, "UserEntity Null")); } From 821a4eb3acfaebd34b80dfe9f3c22c888e4c3510 Mon Sep 17 00:00:00 2001 From: baeppsae Date: Fri, 22 Nov 2024 15:21:33 +0900 Subject: [PATCH 5/7] =?UTF-8?q?@GeneratedValue(strategy=20=3D=20Generation?= =?UTF-8?q?Type.IDENTITY)=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/users/user/db/User.java | 4 ++-- src/main/resources/application.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/users/user/db/User.java b/src/main/java/com/users/user/db/User.java index 9bc7833..ae0b6fe 100644 --- a/src/main/java/com/users/user/db/User.java +++ b/src/main/java/com/users/user/db/User.java @@ -18,7 +18,7 @@ @EqualsAndHashCode(callSuper = false) // Lombok 경고 해결 public class User { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; @Column(nullable = false, unique = true) private String username; @@ -45,5 +45,5 @@ public class User { private LocalDateTime createdAt; @UpdateTimestamp @Column - private LocalDateTime LastAcceptedAt; + private LocalDateTime lastAcceptedAt; } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8207f64..f3a2413 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,9 +14,9 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver #spring.datasource.username=${USER_DB_USERNAME} #spring.datasource.password=${USER_DB_PASSWORD} -spring.datasource.url=jdbc:mariadb://localhost:3307/users +spring.datasource.url=jdbc:mariadb://localhost:3306/users spring.datasource.username=root -spring.datasource.password=1234 +spring.datasource.password=p@ssw0rd # JPA spring.jpa.hibernate.ddl-auto=update From 62814e9cfe7b545c5ee19a64c2a90d8a8dbd65bf Mon Sep 17 00:00:00 2001 From: Sunny Lee <86199470+sunnnycode@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:00:21 +0900 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=ED=86=A0=ED=81=B0=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=8B=9C=20userId=EA=B0=92=EB=8F=84=20=EA=B0=99?= =?UTF-8?q?=EC=9D=B4=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/users/token/business/TokenBusiness.java | 16 ++++++---------- .../token/controller/model/TokenResponse.java | 2 ++ .../users/token/converter/TokenConverter.java | 4 +++- src/main/resources/application.YAML | 2 +- src/main/resources/application.properties | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/users/token/business/TokenBusiness.java b/src/main/java/com/users/token/business/TokenBusiness.java index 92ed7ca..1eac312 100644 --- a/src/main/java/com/users/token/business/TokenBusiness.java +++ b/src/main/java/com/users/token/business/TokenBusiness.java @@ -24,24 +24,20 @@ public class TokenBusiness { * 3. converter -> token response로 변경 */ - public TokenResponse issueToken(User userEntity){ + public TokenResponse issueToken(User userEntity) { return Optional.ofNullable(userEntity) .map(user -> { - return user.getId(); - }) - .map(user -> { - Integer id = userEntity.getId(); - String role = userEntity.getRole().name(); + Integer id = user.getId(); // user.getId()를 변수에 할당 + String role = user.getRole().name(); var accessToken = tokenService.issueAccessToken(id); var refreshToken = tokenService.issueRefreshToken(id); - return tokenConverter.toResponse(accessToken, refreshToken, role); + return tokenConverter.toResponse(accessToken, refreshToken, role, id); // id를 그대로 사용 }) - .orElseThrow( - ()-> new ApiException(ErrorCode.NULL_POINT) - ); + .orElseThrow(() -> new ApiException(ErrorCode.NULL_POINT)); } + public String validationAccessToken(String accessToken){ var id = tokenService.validationToken(accessToken); return id; diff --git a/src/main/java/com/users/token/controller/model/TokenResponse.java b/src/main/java/com/users/token/controller/model/TokenResponse.java index 7aafb81..1e9d221 100644 --- a/src/main/java/com/users/token/controller/model/TokenResponse.java +++ b/src/main/java/com/users/token/controller/model/TokenResponse.java @@ -19,4 +19,6 @@ public class TokenResponse { private String refreshToken; private String role; + + private int id; } \ No newline at end of file diff --git a/src/main/java/com/users/token/converter/TokenConverter.java b/src/main/java/com/users/token/converter/TokenConverter.java index dcd258c..1884233 100644 --- a/src/main/java/com/users/token/converter/TokenConverter.java +++ b/src/main/java/com/users/token/converter/TokenConverter.java @@ -18,7 +18,8 @@ public class TokenConverter { public TokenResponse toResponse( TokenDto accessToken, TokenDto refreshToken, - String role + String role, + int id ) { Objects.requireNonNull(accessToken, () -> { throw new ApiException(ErrorCode.NULL_POINT); @@ -32,6 +33,7 @@ public TokenResponse toResponse( .accessTokenExpiredAt(accessToken.getExpiredAt()) .refreshToken(refreshToken.getToken()) .role(role) + .id(id) .build(); } } \ No newline at end of file diff --git a/src/main/resources/application.YAML b/src/main/resources/application.YAML index 2ec475f..3bd377f 100644 --- a/src/main/resources/application.YAML +++ b/src/main/resources/application.YAML @@ -11,7 +11,7 @@ eureka: register-with-eureka: true fetch-registry: true service-url: - defaultZone: http://localhost:8088/eureka + defaultZone: http://192.168.0.229:8088/eureka instance: instance-id: USERS:8080 # 고정 값으로 설정 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f3a2413..8207f64 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,9 +14,9 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver #spring.datasource.username=${USER_DB_USERNAME} #spring.datasource.password=${USER_DB_PASSWORD} -spring.datasource.url=jdbc:mariadb://localhost:3306/users +spring.datasource.url=jdbc:mariadb://localhost:3307/users spring.datasource.username=root -spring.datasource.password=p@ssw0rd +spring.datasource.password=1234 # JPA spring.jpa.hibernate.ddl-auto=update From 15e9914c27504ccdb5a9586399f4b44f63a4340d Mon Sep 17 00:00:00 2001 From: Sunny Lee <86199470+sunnnycode@users.noreply.github.com> Date: Fri, 22 Nov 2024 18:13:41 +0900 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20user=EC=97=94=ED=8B=B0=ED=8B=B0=20@G?= =?UTF-8?q?eneratedValue(strategy=20=3D=20GenerationType.AUTO)=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/users/user/db/User.java | 2 +- src/main/resources/application.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/users/user/db/User.java b/src/main/java/com/users/user/db/User.java index ae0b6fe..e4d4973 100644 --- a/src/main/java/com/users/user/db/User.java +++ b/src/main/java/com/users/user/db/User.java @@ -18,7 +18,7 @@ @EqualsAndHashCode(callSuper = false) // Lombok 경고 해결 public class User { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @GeneratedValue(strategy = GenerationType.AUTO) private int id; @Column(nullable = false, unique = true) private String username; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8207f64..be20612 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,9 +14,9 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver #spring.datasource.username=${USER_DB_USERNAME} #spring.datasource.password=${USER_DB_PASSWORD} -spring.datasource.url=jdbc:mariadb://localhost:3307/users +spring.datasource.url=jdbc:mariadb://localhost:3307/userdb spring.datasource.username=root -spring.datasource.password=1234 +spring.datasource.password=maria # JPA spring.jpa.hibernate.ddl-auto=update