diff --git a/java/src/main/java/com/leejk0523/javavue/login/controller/UserLoginController.java b/java/src/main/java/com/leejk0523/javavue/admin/login/controller/UserLoginController.java similarity index 74% rename from java/src/main/java/com/leejk0523/javavue/login/controller/UserLoginController.java rename to java/src/main/java/com/leejk0523/javavue/admin/login/controller/UserLoginController.java index 415c898..5c5d25e 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/controller/UserLoginController.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/login/controller/UserLoginController.java @@ -1,8 +1,8 @@ -package com.leejk0523.javavue.login.controller; +package com.leejk0523.javavue.admin.login.controller; -import com.leejk0523.javavue.login.service.UserLoginService; -import com.leejk0523.javavue.login.vo.In; -import com.leejk0523.javavue.login.vo.Out; +import com.leejk0523.javavue.admin.login.service.UserLoginService; +import com.leejk0523.javavue.admin.login.vo.In; +import com.leejk0523.javavue.admin.login.vo.Out; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -15,7 +15,7 @@ import java.util.Objects; public class UserLoginController { private final UserLoginService userLoginService; - @PostMapping("/api/login") + @PostMapping("/api/admin/login") private ResponseEntity login(@RequestBody In in) { final var authorization = userLoginService.login(in); diff --git a/java/src/main/java/com/leejk0523/javavue/login/dao/UserLoginDao.java b/java/src/main/java/com/leejk0523/javavue/admin/login/dao/UserLoginDao.java similarity index 94% rename from java/src/main/java/com/leejk0523/javavue/login/dao/UserLoginDao.java rename to java/src/main/java/com/leejk0523/javavue/admin/login/dao/UserLoginDao.java index 7ce45ee..e258044 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/dao/UserLoginDao.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/login/dao/UserLoginDao.java @@ -1,9 +1,9 @@ -package com.leejk0523.javavue.login.dao; +package com.leejk0523.javavue.admin.login.dao; -import com.leejk0523.javavue.login.vo.AdminMember; -import com.leejk0523.javavue.login.vo.In; -import com.leejk0523.javavue.login.vo.Member; -import com.leejk0523.javavue.login.vo.Out; +import com.leejk0523.javavue.admin.login.vo.AdminMember; +import com.leejk0523.javavue.admin.login.vo.In; +import com.leejk0523.javavue.admin.login.vo.Member; +import com.leejk0523.javavue.admin.login.vo.Out; import com.leejk0523.javavue.model.*; import com.querydsl.core.types.Projections; diff --git a/java/src/main/java/com/leejk0523/javavue/admin/login/service/UserLoginService.java b/java/src/main/java/com/leejk0523/javavue/admin/login/service/UserLoginService.java new file mode 100644 index 0000000..d1def01 --- /dev/null +++ b/java/src/main/java/com/leejk0523/javavue/admin/login/service/UserLoginService.java @@ -0,0 +1,8 @@ +package com.leejk0523.javavue.admin.login.service; + +import com.leejk0523.javavue.admin.login.vo.In; +import com.leejk0523.javavue.admin.login.vo.Out; + +public interface UserLoginService { + Out login(In in); +} diff --git a/java/src/main/java/com/leejk0523/javavue/login/service/UserLoginServiceImpl.java b/java/src/main/java/com/leejk0523/javavue/admin/login/service/UserLoginServiceImpl.java similarity index 89% rename from java/src/main/java/com/leejk0523/javavue/login/service/UserLoginServiceImpl.java rename to java/src/main/java/com/leejk0523/javavue/admin/login/service/UserLoginServiceImpl.java index 2eed1d7..66c20fc 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/service/UserLoginServiceImpl.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/login/service/UserLoginServiceImpl.java @@ -1,8 +1,8 @@ -package com.leejk0523.javavue.login.service; +package com.leejk0523.javavue.admin.login.service; -import com.leejk0523.javavue.login.dao.UserLoginDao; -import com.leejk0523.javavue.login.vo.In; -import com.leejk0523.javavue.login.vo.Out; +import com.leejk0523.javavue.admin.login.dao.UserLoginDao; +import com.leejk0523.javavue.admin.login.vo.In; +import com.leejk0523.javavue.admin.login.vo.Out; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/java/src/main/java/com/leejk0523/javavue/login/vo/AdminMember.java b/java/src/main/java/com/leejk0523/javavue/admin/login/vo/AdminMember.java similarity index 93% rename from java/src/main/java/com/leejk0523/javavue/login/vo/AdminMember.java rename to java/src/main/java/com/leejk0523/javavue/admin/login/vo/AdminMember.java index 5af9f3a..c725b99 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/vo/AdminMember.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/login/vo/AdminMember.java @@ -1,4 +1,4 @@ -package com.leejk0523.javavue.login.vo; +package com.leejk0523.javavue.admin.login.vo; import com.leejk0523.javavue.model.AsaAdminMember; import lombok.AllArgsConstructor; diff --git a/java/src/main/java/com/leejk0523/javavue/login/vo/In.java b/java/src/main/java/com/leejk0523/javavue/admin/login/vo/In.java similarity index 86% rename from java/src/main/java/com/leejk0523/javavue/login/vo/In.java rename to java/src/main/java/com/leejk0523/javavue/admin/login/vo/In.java index ee780c8..de24215 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/vo/In.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/login/vo/In.java @@ -1,4 +1,4 @@ -package com.leejk0523.javavue.login.vo; +package com.leejk0523.javavue.admin.login.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/src/main/java/com/leejk0523/javavue/login/vo/Member.java b/java/src/main/java/com/leejk0523/javavue/admin/login/vo/Member.java similarity index 90% rename from java/src/main/java/com/leejk0523/javavue/login/vo/Member.java rename to java/src/main/java/com/leejk0523/javavue/admin/login/vo/Member.java index a64e0e9..9073db3 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/vo/Member.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/login/vo/Member.java @@ -1,4 +1,4 @@ -package com.leejk0523.javavue.login.vo; +package com.leejk0523.javavue.admin.login.vo; public interface Member { String getMemberName(); diff --git a/java/src/main/java/com/leejk0523/javavue/login/vo/Out.java b/java/src/main/java/com/leejk0523/javavue/admin/login/vo/Out.java similarity index 97% rename from java/src/main/java/com/leejk0523/javavue/login/vo/Out.java rename to java/src/main/java/com/leejk0523/javavue/admin/login/vo/Out.java index 1b77e5b..a197f36 100644 --- a/java/src/main/java/com/leejk0523/javavue/login/vo/Out.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/login/vo/Out.java @@ -1,4 +1,4 @@ -package com.leejk0523.javavue.login.vo; +package com.leejk0523.javavue.admin.login.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.leejk0523.javavue.model.AsaMenu; diff --git a/java/src/main/java/com/leejk0523/javavue/site/controller/AdminSiteController.java b/java/src/main/java/com/leejk0523/javavue/admin/site/controller/AdminSiteController.java similarity index 77% rename from java/src/main/java/com/leejk0523/javavue/site/controller/AdminSiteController.java rename to java/src/main/java/com/leejk0523/javavue/admin/site/controller/AdminSiteController.java index ba39689..11e67f7 100644 --- a/java/src/main/java/com/leejk0523/javavue/site/controller/AdminSiteController.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/site/controller/AdminSiteController.java @@ -1,7 +1,7 @@ -package com.leejk0523.javavue.site.controller; +package com.leejk0523.javavue.admin.site.controller; import com.leejk0523.javavue.model.AsaSite; -import com.leejk0523.javavue.site.service.AdminSiteService; +import com.leejk0523.javavue.admin.site.service.AdminSiteService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -14,7 +14,7 @@ import java.util.List; public class AdminSiteController { private final AdminSiteService adminSiteService; - @GetMapping("/api/sys/site/siteList") + @GetMapping("/api/admin/sys/site/siteList") public ResponseEntity> siteAllList() { final var results = adminSiteService.SiteAllList(); return ResponseEntity.ok(results); diff --git a/java/src/main/java/com/leejk0523/javavue/site/dao/AdminSiteDao.java b/java/src/main/java/com/leejk0523/javavue/admin/site/dao/AdminSiteDao.java similarity index 92% rename from java/src/main/java/com/leejk0523/javavue/site/dao/AdminSiteDao.java rename to java/src/main/java/com/leejk0523/javavue/admin/site/dao/AdminSiteDao.java index 33dfca9..e000896 100644 --- a/java/src/main/java/com/leejk0523/javavue/site/dao/AdminSiteDao.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/site/dao/AdminSiteDao.java @@ -1,4 +1,4 @@ -package com.leejk0523.javavue.site.dao; +package com.leejk0523.javavue.admin.site.dao; import com.leejk0523.javavue.model.AsaSite; import com.leejk0523.javavue.model.QAsaSite; diff --git a/java/src/main/java/com/leejk0523/javavue/admin/site/dao/AdminSiteRepository.java b/java/src/main/java/com/leejk0523/javavue/admin/site/dao/AdminSiteRepository.java new file mode 100644 index 0000000..927974d --- /dev/null +++ b/java/src/main/java/com/leejk0523/javavue/admin/site/dao/AdminSiteRepository.java @@ -0,0 +1,11 @@ +package com.leejk0523.javavue.admin.site.dao; + +import com.leejk0523.javavue.model.AsaSite; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface AdminSiteRepository extends JpaRepository { +} diff --git a/java/src/main/java/com/leejk0523/javavue/site/service/AdminSiteService.java b/java/src/main/java/com/leejk0523/javavue/admin/site/service/AdminSiteService.java similarity index 63% rename from java/src/main/java/com/leejk0523/javavue/site/service/AdminSiteService.java rename to java/src/main/java/com/leejk0523/javavue/admin/site/service/AdminSiteService.java index 3f0a2d1..c2df8dc 100644 --- a/java/src/main/java/com/leejk0523/javavue/site/service/AdminSiteService.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/site/service/AdminSiteService.java @@ -1,8 +1,9 @@ -package com.leejk0523.javavue.site.service; +package com.leejk0523.javavue.admin.site.service; import com.leejk0523.javavue.model.AsaSite; import java.util.List; public interface AdminSiteService { List SiteAllList(); + List findAll(); } diff --git a/java/src/main/java/com/leejk0523/javavue/site/service/AdminSiteServiceImpl.java b/java/src/main/java/com/leejk0523/javavue/admin/site/service/AdminSiteServiceImpl.java similarity index 54% rename from java/src/main/java/com/leejk0523/javavue/site/service/AdminSiteServiceImpl.java rename to java/src/main/java/com/leejk0523/javavue/admin/site/service/AdminSiteServiceImpl.java index d9be8ae..8f59b9c 100644 --- a/java/src/main/java/com/leejk0523/javavue/site/service/AdminSiteServiceImpl.java +++ b/java/src/main/java/com/leejk0523/javavue/admin/site/service/AdminSiteServiceImpl.java @@ -1,7 +1,8 @@ -package com.leejk0523.javavue.site.service; +package com.leejk0523.javavue.admin.site.service; +import com.leejk0523.javavue.admin.site.dao.AdminSiteRepository; import com.leejk0523.javavue.model.AsaSite; -import com.leejk0523.javavue.site.dao.AdminSiteDao; +import com.leejk0523.javavue.admin.site.dao.AdminSiteDao; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -11,9 +12,15 @@ import java.util.List; @RequiredArgsConstructor public class AdminSiteServiceImpl implements AdminSiteService { private final AdminSiteDao adminSiteDao; + private final AdminSiteRepository adminSiteRepository; @Override public List SiteAllList() { return adminSiteDao.SiteAllList(); } + + @Override + public List findAll() { + return adminSiteRepository.findAll(); + } } diff --git a/java/src/main/java/com/leejk0523/javavue/login/service/UserLoginService.java b/java/src/main/java/com/leejk0523/javavue/login/service/UserLoginService.java deleted file mode 100644 index 737155d..0000000 --- a/java/src/main/java/com/leejk0523/javavue/login/service/UserLoginService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.leejk0523.javavue.login.service; - -import com.leejk0523.javavue.login.vo.In; -import com.leejk0523.javavue.login.vo.Out; - -public interface UserLoginService { - Out login(In in); -}