From 965d8830d8acbf5d04e38fcdb41e17139a1d2af1 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Sun, 2 Oct 2022 08:31:49 -0400 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring/security/controllers/AuthController.java | 4 ++-- .../spring/security/models/{ => entity}/Role.java | 4 +++- .../spring/security/models/{ => entity}/User.java | 2 +- .../spring/security/repository/RoleRepository.java | 2 +- .../spring/security/repository/UserRepository.java | 2 +- .../security/security/services/UserDetailsImpl.java | 2 +- .../security/services/UserDetailsServiceImpl.java | 2 +- src/main/resources/db/schema.sql | 12 ++++++++++++ 8 files changed, 22 insertions(+), 8 deletions(-) rename src/main/java/com/ossez/spring/security/models/{ => entity}/Role.java (84%) rename src/main/java/com/ossez/spring/security/models/{ => entity}/User.java (97%) create mode 100644 src/main/resources/db/schema.sql diff --git a/src/main/java/com/ossez/spring/security/controllers/AuthController.java b/src/main/java/com/ossez/spring/security/controllers/AuthController.java index 9241f9b..16862e5 100644 --- a/src/main/java/com/ossez/spring/security/controllers/AuthController.java +++ b/src/main/java/com/ossez/spring/security/controllers/AuthController.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; import javax.validation.Valid; import com.ossez.spring.security.models.ERole; -import com.ossez.spring.security.models.Role; +import com.ossez.spring.security.models.entity.Role; import com.ossez.spring.security.payload.request.LoginRequest; import com.ossez.spring.security.payload.request.SignupRequest; import com.ossez.spring.security.payload.response.JwtResponse; @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ossez.spring.security.models.User; +import com.ossez.spring.security.models.entity.User; import com.ossez.spring.security.repository.RoleRepository; import com.ossez.spring.security.repository.UserRepository; diff --git a/src/main/java/com/ossez/spring/security/models/Role.java b/src/main/java/com/ossez/spring/security/models/entity/Role.java similarity index 84% rename from src/main/java/com/ossez/spring/security/models/Role.java rename to src/main/java/com/ossez/spring/security/models/entity/Role.java index 556cefa..91feb6e 100644 --- a/src/main/java/com/ossez/spring/security/models/Role.java +++ b/src/main/java/com/ossez/spring/security/models/entity/Role.java @@ -1,4 +1,6 @@ -package com.ossez.spring.security.models; +package com.ossez.spring.security.models.entity; + +import com.ossez.spring.security.models.ERole; import javax.persistence.*; diff --git a/src/main/java/com/ossez/spring/security/models/User.java b/src/main/java/com/ossez/spring/security/models/entity/User.java similarity index 97% rename from src/main/java/com/ossez/spring/security/models/User.java rename to src/main/java/com/ossez/spring/security/models/entity/User.java index 1f40be6..552d30b 100644 --- a/src/main/java/com/ossez/spring/security/models/User.java +++ b/src/main/java/com/ossez/spring/security/models/entity/User.java @@ -1,4 +1,4 @@ -package com.ossez.spring.security.models; +package com.ossez.spring.security.models.entity; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/ossez/spring/security/repository/RoleRepository.java b/src/main/java/com/ossez/spring/security/repository/RoleRepository.java index e3abb23..480b895 100644 --- a/src/main/java/com/ossez/spring/security/repository/RoleRepository.java +++ b/src/main/java/com/ossez/spring/security/repository/RoleRepository.java @@ -3,7 +3,7 @@ package com.ossez.spring.security.repository; import java.util.Optional; import com.ossez.spring.security.models.ERole; -import com.ossez.spring.security.models.Role; +import com.ossez.spring.security.models.entity.Role; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/ossez/spring/security/repository/UserRepository.java b/src/main/java/com/ossez/spring/security/repository/UserRepository.java index ea82849..4242f97 100644 --- a/src/main/java/com/ossez/spring/security/repository/UserRepository.java +++ b/src/main/java/com/ossez/spring/security/repository/UserRepository.java @@ -5,7 +5,7 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.ossez.spring.security.models.User; +import com.ossez.spring.security.models.entity.User; @Repository public interface UserRepository extends JpaRepository { diff --git a/src/main/java/com/ossez/spring/security/security/services/UserDetailsImpl.java b/src/main/java/com/ossez/spring/security/security/services/UserDetailsImpl.java index cfc7ab2..7ac5d93 100644 --- a/src/main/java/com/ossez/spring/security/security/services/UserDetailsImpl.java +++ b/src/main/java/com/ossez/spring/security/security/services/UserDetailsImpl.java @@ -9,7 +9,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import com.ossez.spring.security.models.User; +import com.ossez.spring.security.models.entity.User; import com.fasterxml.jackson.annotation.JsonIgnore; public class UserDetailsImpl implements UserDetails { diff --git a/src/main/java/com/ossez/spring/security/security/services/UserDetailsServiceImpl.java b/src/main/java/com/ossez/spring/security/security/services/UserDetailsServiceImpl.java index b5e985e..3db7947 100644 --- a/src/main/java/com/ossez/spring/security/security/services/UserDetailsServiceImpl.java +++ b/src/main/java/com/ossez/spring/security/security/services/UserDetailsServiceImpl.java @@ -7,7 +7,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ossez.spring.security.models.User; +import com.ossez.spring.security.models.entity.User; import com.ossez.spring.security.repository.UserRepository; @Service diff --git a/src/main/resources/db/schema.sql b/src/main/resources/db/schema.sql new file mode 100644 index 0000000..58a3179 --- /dev/null +++ b/src/main/resources/db/schema.sql @@ -0,0 +1,12 @@ +DROP ALL OBJECTS; + +CREATE SCHEMA IF NOT EXISTS iOssez; + +CREATE TABLE IF NOT EXISTS iOssez.users +( + id INT NOT NULL, + user_name varchar(11) NOT NULL, + user_password varchar(2) NOT NULL, + user_email varchar(2) NOT NULL, + is_email_verified INT NOT NULL +);