diff --git a/.gitignore b/.gitignore index 6586eaac..72989815 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ out/ ### VS Code ### .vscode/ +*.properties \ No newline at end of file diff --git a/build.gradle b/build.gradle index b915b118..fa52532a 100644 --- a/build.gradle +++ b/build.gradle @@ -103,6 +103,9 @@ project(":layer-domain"){ implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' + // h2 + runtimeOnly 'com.h2database:h2' + testImplementation platform('org.junit:junit-bom:5.9.1') testImplementation 'org.junit.jupiter:junit-jupiter' } diff --git a/layer-api/src/main/java/org/layer/api/controller/HelloController.java b/layer-api/src/main/java/org/layer/api/controller/HelloController.java index f6a1ed28..18c23116 100644 --- a/layer-api/src/main/java/org/layer/api/controller/HelloController.java +++ b/layer-api/src/main/java/org/layer/api/controller/HelloController.java @@ -1,7 +1,7 @@ package org.layer.api.controller; import lombok.RequiredArgsConstructor; -import org.layer.common.model.Sample; + import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,7 +12,7 @@ public class HelloController { @GetMapping("") - public Sample test(){ - return new Sample("hello"); + public String test(){ + return "Hello"; } } diff --git a/layer-api/src/main/java/org/layer/auth/api/AuthController.java b/layer-api/src/main/java/org/layer/auth/api/AuthController.java index c05ca7b4..10457594 100644 --- a/layer-api/src/main/java/org/layer/auth/api/AuthController.java +++ b/layer-api/src/main/java/org/layer/auth/api/AuthController.java @@ -3,7 +3,7 @@ import lombok.RequiredArgsConstructor; import org.layer.auth.jwt.JwtToken; import org.layer.auth.service.JwtService; -import org.layer.member.MemberRole; +import org.layer.domain.member.entity.MemberRole; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/layer-api/src/main/java/org/layer/auth/jwt/JwtAuthenticationFilter.java b/layer-api/src/main/java/org/layer/auth/jwt/JwtAuthenticationFilter.java index 11dd806a..8f510632 100644 --- a/layer-api/src/main/java/org/layer/auth/jwt/JwtAuthenticationFilter.java +++ b/layer-api/src/main/java/org/layer/auth/jwt/JwtAuthenticationFilter.java @@ -1,23 +1,19 @@ package org.layer.auth.jwt; -import com.nimbusds.oauth2.sdk.Role; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.layer.member.Member; -import org.layer.member.MemberRole; +import org.layer.domain.member.entity.MemberRole; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; -import java.util.LinkedHashMap; import java.util.List; @Slf4j diff --git a/layer-api/src/main/java/org/layer/auth/jwt/MemberAuthentication.java b/layer-api/src/main/java/org/layer/auth/jwt/MemberAuthentication.java index a8fd36e5..8d07eda4 100644 --- a/layer-api/src/main/java/org/layer/auth/jwt/MemberAuthentication.java +++ b/layer-api/src/main/java/org/layer/auth/jwt/MemberAuthentication.java @@ -1,8 +1,7 @@ package org.layer.auth.jwt; import lombok.Builder; -import lombok.RequiredArgsConstructor; -import org.layer.member.MemberRole; +import org.layer.domain.member.entity.MemberRole; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/layer-api/src/main/java/org/layer/auth/service/JwtService.java b/layer-api/src/main/java/org/layer/auth/service/JwtService.java index 344ec137..2467a4ae 100644 --- a/layer-api/src/main/java/org/layer/auth/service/JwtService.java +++ b/layer-api/src/main/java/org/layer/auth/service/JwtService.java @@ -3,10 +3,8 @@ import lombok.RequiredArgsConstructor; import org.layer.auth.exception.TokenException; import org.layer.auth.jwt.*; -import org.layer.config.AuthValueConfig; -import org.layer.member.MemberRole; +import org.layer.domain.member.entity.MemberRole; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; import java.time.Duration; diff --git a/layer-api/src/main/java/org/layer/config/RedisConfig.java b/layer-api/src/main/java/org/layer/config/RedisConfig.java index a33b7dbe..c7d7d060 100644 --- a/layer-api/src/main/java/org/layer/config/RedisConfig.java +++ b/layer-api/src/main/java/org/layer/config/RedisConfig.java @@ -1,6 +1,6 @@ package org.layer.config; -import org.layer.member.Member; +import org.layer.domain.member.entity.Member; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;