From 86d76b6d385763167405126fb870579be0605709 Mon Sep 17 00:00:00 2001 From: geonhos Date: Wed, 8 May 2024 14:23:34 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20,=20=EA=B6=8C=ED=99=98=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=B9=88=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=B0=8F=20Entity,?= =?UTF-8?q?=20Data=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poc/admin/build.gradle | 2 +- .../poc/admin/domain/admin/Administrator.java | 11 +++-- .../admin/domain/admin/AdministratorRole.java | 24 +++++++++++ .../bpgroup/poc/admin/domain/admin/Menu.java | 14 +++++++ .../bpgroup/poc/admin/domain/admin/Role.java | 26 ++++++++++++ .../poc/admin/domain/admin/RoleMenu.java | 22 ++++++++++ .../admin/domain/admin/RoleRepository.java | 6 +++ .../poc/admin/security/SecurityConfig.java | 17 ++++---- .../web/advice/PathInfoControllerAdvice.java | 35 ++++++++++++++++ .../AdministratorManagementController.java | 16 ++++++++ .../web/main/admin/role/RoleController.java | 15 +++++++ poc/admin/src/main/resources/data.sql | 17 +++++++- .../resources/templates/layout/common.html | 36 +++++++++++++++++ .../templates/{main => layout}/gnb.html | 0 .../main/resources/templates/layout/lnb.html | 23 +++++++++++ .../templates/main/admin/management/list.html | 14 +++++++ .../templates/main/admin/management/root.html | 15 +++++++ .../templates/main/admin/role/list.html | 14 +++++++ .../templates/main/admin/role/root.html | 15 +++++++ .../main/resources/templates/main/lnb.html | 24 ----------- .../main/resources/templates/main/main.html | 40 +++++-------------- 21 files changed, 319 insertions(+), 67 deletions(-) create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRole.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleRepository.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/PathInfoControllerAdvice.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementController.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleController.java create mode 100644 poc/admin/src/main/resources/templates/layout/common.html rename poc/admin/src/main/resources/templates/{main => layout}/gnb.html (100%) create mode 100644 poc/admin/src/main/resources/templates/layout/lnb.html create mode 100644 poc/admin/src/main/resources/templates/main/admin/management/list.html create mode 100644 poc/admin/src/main/resources/templates/main/admin/management/root.html create mode 100644 poc/admin/src/main/resources/templates/main/admin/role/list.html create mode 100644 poc/admin/src/main/resources/templates/main/admin/role/root.html delete mode 100644 poc/admin/src/main/resources/templates/main/lnb.html diff --git a/poc/admin/build.gradle b/poc/admin/build.gradle index fd1e58f..ffa503d 100644 --- a/poc/admin/build.gradle +++ b/poc/admin/build.gradle @@ -21,7 +21,7 @@ dependencies { // thymeleaf implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0' // jpa implementation 'org.springframework.boot:spring-boot-starter-data-jpa' diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Administrator.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Administrator.java index bf0f65e..d82129c 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Administrator.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Administrator.java @@ -13,16 +13,19 @@ public class Administrator extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "login_id") + @Column(name = "login_id", length = 100, nullable = false) private String loginId; - @Column(name = "password") + @Column(name = "password", length = 255, nullable = false) private String password; - @Column(name = "email") + @Column(name = "email", length = 100, nullable = false) private String email; - @Column(name = "name") + @Column(name = "name", length = 100, nullable = false) private String name; + @OneToOne(mappedBy = "administrator", fetch = FetchType.LAZY) + private AdministratorRole administratorRole; + } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRole.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRole.java new file mode 100644 index 0000000..bb26a09 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRole.java @@ -0,0 +1,24 @@ +package com.bpgroup.poc.admin.domain.admin; + +import com.bpgroup.poc.admin.domain.BaseEntity; +import jakarta.persistence.*; +import lombok.Getter; + +@Getter +@Entity +@Table(name = "administrator_role") +public class AdministratorRole extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinColumn(name = "administrator_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private Administrator administrator; + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinColumn(name = "role_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private Role role; + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java new file mode 100644 index 0000000..35b35af --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java @@ -0,0 +1,14 @@ +package com.bpgroup.poc.admin.domain.admin; + +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public enum Menu { + ADMINISTRATOR_MANAGEMENT("/admin/management", "관리자 관리"), + ROLE_MANAGEMENT("/admin/role", "권한 관리"), + MENU_MANAGEMENT("/admin/menu", "메뉴 관리") + ; + + private final String uri; + private final String name; +} \ No newline at end of file diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java new file mode 100644 index 0000000..02a6a23 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java @@ -0,0 +1,26 @@ +package com.bpgroup.poc.admin.domain.admin; + +import com.bpgroup.poc.admin.domain.BaseEntity; +import jakarta.persistence.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "role") +public class Role extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", length = 100, nullable = false) + private String name; + + @Column(name = "description") + private String description; + + @OneToMany(mappedBy = "role", fetch = FetchType.LAZY) + private List roleMenus = new ArrayList<>(); + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java new file mode 100644 index 0000000..df8a1d4 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java @@ -0,0 +1,22 @@ +package com.bpgroup.poc.admin.domain.admin; + +import com.bpgroup.poc.admin.domain.BaseEntity; +import jakarta.persistence.*; + +@Table +@Entity(name = "role_menu") +public class RoleMenu extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinColumn(name = "role_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private Role role; + + @Enumerated(EnumType.STRING) + @Column(name = "menu", length = 100, nullable = false) + private Menu menu; + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleRepository.java new file mode 100644 index 0000000..449da60 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleRepository.java @@ -0,0 +1,6 @@ +package com.bpgroup.poc.admin.domain.admin; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface RoleRepository extends JpaRepository { +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java index 24c7d3e..9261d37 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java @@ -2,6 +2,7 @@ package com.bpgroup.poc.admin.security; import com.bpgroup.poc.admin.common.FormatHelper; import com.bpgroup.poc.admin.security.authentication.AuthenticationFailException; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -15,6 +16,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import java.util.Objects; @Configuration +@RequiredArgsConstructor public class SecurityConfig { private static final String LOGIN_PATH = "/login"; @@ -27,19 +29,20 @@ public class SecurityConfig { CsrfTokenRequestAttributeHandler csrfTokenRequestAttributeHandler = new CsrfTokenRequestAttributeHandler(); csrfTokenRequestAttributeHandler.setCsrfRequestAttributeName("_csrf"); - http.csrf(t -> { - t.csrfTokenRequestHandler(csrfTokenRequestAttributeHandler) + http.csrf(c -> { + c.csrfTokenRequestHandler(csrfTokenRequestAttributeHandler) .ignoringRequestMatchers("/common/modal/**") .ignoringRequestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH) // CSRF 무시 URL 설정 .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()); // CSRF 토큰을 쿠키에 저장 및 사용 가능 }).addFilterAfter(new CsrfCookieFilter(), BasicAuthenticationFilter.class); // 로그인이 완료된 후 CSRF Filter 를 실행 // 인증 설정 - http.authorizeHttpRequests(c -> c - .requestMatchers("/css/**", "/images/**", "/js/**").permitAll() - .requestMatchers("/common/modal/**").permitAll() - .requestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH).permitAll() - .anyRequest().authenticated()); + http.authorizeHttpRequests(c -> { + c.requestMatchers("/css/**", "/images/**", "/js/**").permitAll() + .requestMatchers("/common/modal/**").permitAll() + .requestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH).permitAll() + .anyRequest().authenticated(); + }); http.formLogin(c -> c .loginPage(LOGIN_PATH) diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/PathInfoControllerAdvice.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/PathInfoControllerAdvice.java new file mode 100644 index 0000000..044d070 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/PathInfoControllerAdvice.java @@ -0,0 +1,35 @@ +package com.bpgroup.poc.admin.web.advice; + +import jakarta.servlet.http.HttpServletRequest; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ModelAttribute; + +@ControllerAdvice +@RequiredArgsConstructor +public class PathInfoControllerAdvice { + + @ModelAttribute("pathInfo") + public PathInfo pathInfo(HttpServletRequest request) { + return new PathInfo(request); + } + + @Getter + public static class PathInfo { + + private final String currentPath; + + public PathInfo(HttpServletRequest request) { + this.currentPath = request.getServletPath(); + } + + public boolean isActive(String path) { + return currentPath.startsWith(path); + } + + public String activeClass(String path) { + return isActive(path) ? "active" : ""; + } + } +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementController.java new file mode 100644 index 0000000..ebddf87 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementController.java @@ -0,0 +1,16 @@ +package com.bpgroup.poc.admin.web.main.admin.management; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/admin/management") +public class AdministratorManagementController { + + @GetMapping + public String administratorManagementPage() { + return "main/admin/management/list"; + } + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleController.java new file mode 100644 index 0000000..4ab3b8e --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleController.java @@ -0,0 +1,15 @@ +package com.bpgroup.poc.admin.web.main.admin.role; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/admin/role") +public class RoleController { + + @GetMapping + public String rolePage() { + return "main/admin/role/list"; + } +} diff --git a/poc/admin/src/main/resources/data.sql b/poc/admin/src/main/resources/data.sql index 1544061..259b787 100644 --- a/poc/admin/src/main/resources/data.sql +++ b/poc/admin/src/main/resources/data.sql @@ -1,2 +1,17 @@ INSERT INTO `administrator` (`login_id`, `password`, `email`, `name`, `create_date`, `update_date`) -VALUES ('admin', '$2a$10$g6UOrQ/OS8o5r5CJk7C5juVFaItQ62U3EIn8zLPzkFplM3wVLvKZ2', 'admin@admin.com', '홍길동', CURDATE(), CURDATE()); \ No newline at end of file +VALUES ('admin', '$2a$10$g6UOrQ/OS8o5r5CJk7C5juVFaItQ62U3EIn8zLPzkFplM3wVLvKZ2', 'admin@admin.com', '홍길동', CURDATE(), CURDATE()); + +INSERT INTO `role` (`name`, `description`, `create_date`, `update_date`) +VALUES ('SUPER_ADMIN', '최고 관리자', CURDATE(), CURDATE()), + ('ADMIN', '관리자', CURDATE(), CURDATE()), + ('CLIENT', '고객', CURDATE(), CURDATE()); + +INSERT INTO `administrator_role` (`administrator_id`, `role_id`, `create_date`, `update_date`) +VALUES ('1', '1', CURDATE(), CURDATE()); + +INSERT INTO `role_menu` (`role_id`, `menu`, `create_date`, `update_date`) +VALUES ('1', 'ADMINISTRATOR_MANAGEMENT', CURDATE(), CURDATE()), + ('1', 'ROLE_MANAGEMENT', CURDATE(), CURDATE()), + ('1', 'MENU_MANAGEMENT', CURDATE(), CURDATE()); + + diff --git a/poc/admin/src/main/resources/templates/layout/common.html b/poc/admin/src/main/resources/templates/layout/common.html new file mode 100644 index 0000000..64dd0c5 --- /dev/null +++ b/poc/admin/src/main/resources/templates/layout/common.html @@ -0,0 +1,36 @@ + + + + + + + 관리자 시스템 + + + + + + + + + + + + + + +
+ +
+
+ +
+ +
+
+ + + + + diff --git a/poc/admin/src/main/resources/templates/main/gnb.html b/poc/admin/src/main/resources/templates/layout/gnb.html similarity index 100% rename from poc/admin/src/main/resources/templates/main/gnb.html rename to poc/admin/src/main/resources/templates/layout/gnb.html diff --git a/poc/admin/src/main/resources/templates/layout/lnb.html b/poc/admin/src/main/resources/templates/layout/lnb.html new file mode 100644 index 0000000..bf7f63e --- /dev/null +++ b/poc/admin/src/main/resources/templates/layout/lnb.html @@ -0,0 +1,23 @@ + + + + + + + diff --git a/poc/admin/src/main/resources/templates/main/admin/management/list.html b/poc/admin/src/main/resources/templates/main/admin/management/list.html new file mode 100644 index 0000000..bb3d4ab --- /dev/null +++ b/poc/admin/src/main/resources/templates/main/admin/management/list.html @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/poc/admin/src/main/resources/templates/main/admin/management/root.html b/poc/admin/src/main/resources/templates/main/admin/management/root.html new file mode 100644 index 0000000..761f575 --- /dev/null +++ b/poc/admin/src/main/resources/templates/main/admin/management/root.html @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/poc/admin/src/main/resources/templates/main/admin/role/list.html b/poc/admin/src/main/resources/templates/main/admin/role/list.html new file mode 100644 index 0000000..d4ebe8f --- /dev/null +++ b/poc/admin/src/main/resources/templates/main/admin/role/list.html @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/poc/admin/src/main/resources/templates/main/admin/role/root.html b/poc/admin/src/main/resources/templates/main/admin/role/root.html new file mode 100644 index 0000000..761f575 --- /dev/null +++ b/poc/admin/src/main/resources/templates/main/admin/role/root.html @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/poc/admin/src/main/resources/templates/main/lnb.html b/poc/admin/src/main/resources/templates/main/lnb.html deleted file mode 100644 index 9e3015f..0000000 --- a/poc/admin/src/main/resources/templates/main/lnb.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/poc/admin/src/main/resources/templates/main/main.html b/poc/admin/src/main/resources/templates/main/main.html index 2be9a79..0e4b13b 100644 --- a/poc/admin/src/main/resources/templates/main/main.html +++ b/poc/admin/src/main/resources/templates/main/main.html @@ -1,37 +1,17 @@ - - - - - 관리자 시스템 - - - - - - - - - - - - - + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + layout:decorate="~{layout/common.html}"> -
- -
-
- -
- -
-
- - + + + + + + From 249cc080e53384bab770ff89978245e655e919f9 Mon Sep 17 00:00:00 2001 From: geonhos Date: Wed, 8 May 2024 14:34:35 +0900 Subject: [PATCH 2/6] =?UTF-8?q?logback=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-local.yml | 3 +++ .../src/main/resources/logback-local.xml | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 poc/admin/src/main/resources/logback-local.xml diff --git a/poc/admin/src/main/resources/application-local.yml b/poc/admin/src/main/resources/application-local.yml index d8ed351..a33e61d 100644 --- a/poc/admin/src/main/resources/application-local.yml +++ b/poc/admin/src/main/resources/application-local.yml @@ -17,3 +17,6 @@ spring: hibernate: ddl-auto: create-drop defer-datasource-initialization: true + +logging: + config: classpath:logback-local.xml diff --git a/poc/admin/src/main/resources/logback-local.xml b/poc/admin/src/main/resources/logback-local.xml new file mode 100644 index 0000000..571a8ef --- /dev/null +++ b/poc/admin/src/main/resources/logback-local.xml @@ -0,0 +1,24 @@ + + + + + %5p|%d{yyyy-MM-dd HH:mm:ss.SSS}|%X{loginId}|%32X{sessionId}|%32X{transactionId}|%logger:%line|%msg%n + + + + + + + + + + + + + + + + + + + From c4e33cf22faf1f997913d1ec60f231911bb69ca5 Mon Sep 17 00:00:00 2001 From: geonhos Date: Thu, 9 May 2024 10:10:12 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EB=8F=99=EC=A0=81=20?= =?UTF-8?q?=EB=85=B8=EC=B6=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poc/admin/build.gradle | 1 + poc/admin/database/docker-compose.yml | 2 +- .../poc/admin/app/login/LoginResult.java | 41 +++++++++++- .../poc/admin/app/login/LoginService.java | 26 +++++++- .../bpgroup/poc/admin/domain/admin/Menu.java | 35 +++++++--- .../poc/admin/domain/admin/MenuGroup.java | 25 +++++++ .../admin/domain/admin/MenuRepository.java | 6 ++ .../bpgroup/poc/admin/domain/admin/Role.java | 8 ++- .../poc/admin/domain/admin/RoleMenu.java | 10 +-- .../authentication/AuthenticationDetail.java | 66 +++++++++++++++++++ .../poc/admin/values/AdministratorMenu.java | 4 ++ .../poc/admin/web/login/LoginController.java | 4 +- .../src/main/resources/application-local.yml | 2 +- poc/admin/src/main/resources/application.yml | 2 +- poc/admin/src/main/resources/data.sql | 49 ++++++++++++-- .../main/resources/templates/layout/lnb.html | 28 ++++---- 16 files changed, 267 insertions(+), 42 deletions(-) create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuGroup.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuRepository.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/values/AdministratorMenu.java diff --git a/poc/admin/build.gradle b/poc/admin/build.gradle index ffa503d..90325d8 100644 --- a/poc/admin/build.gradle +++ b/poc/admin/build.gradle @@ -21,6 +21,7 @@ dependencies { // thymeleaf implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0' // jpa diff --git a/poc/admin/database/docker-compose.yml b/poc/admin/database/docker-compose.yml index 3cf2142..f0a0c7f 100644 --- a/poc/admin/database/docker-compose.yml +++ b/poc/admin/database/docker-compose.yml @@ -12,7 +12,7 @@ services: environment: - TZ=Asia/Seoul - MARIADB_ROOT_PASSWORD=root - - MARIADB_DATABASE=login + - MARIADB_DATABASE=admin-system - MARIADB_USER=admin - MARIADB_PASSWORD=1234 diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginResult.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginResult.java index a4ed910..5195fbd 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginResult.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginResult.java @@ -1,22 +1,59 @@ package com.bpgroup.poc.admin.app.login; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; +import java.util.HashSet; +import java.util.Set; + @Getter -@ToString public class LoginResult { private Long id; private String loginId; private String name; private String email; - public static LoginResult of(Long id, String loginId, String name, String email) { + private Set menus = new HashSet<>(); + + public static LoginResult of(Long id, String loginId, String name, String email, Set menus) { LoginResult loginResult = new LoginResult(); loginResult.id = id; loginResult.loginId = loginId; loginResult.name = name; loginResult.email = email; + loginResult.menus = menus; return loginResult; } + + @Getter + @ToString + @EqualsAndHashCode + public static class MenuInfo { + private String menuGroupUri; + private String menuGroupName; + private Integer menuGroupSortOrder; + private String menuUri; + private String menuName; + private Integer menuSortOrder; + + public static MenuInfo of( + String menuGroupUri, + String menuGroupName, + Integer menuGroupSortOrder, + String menuUri, + String menuName, + Integer menuSortOrder + ) { + MenuInfo menuInfo = new MenuInfo(); + menuInfo.menuGroupUri = menuGroupUri; + menuInfo.menuGroupName = menuGroupName; + menuInfo.menuGroupSortOrder = menuGroupSortOrder; + menuInfo.menuUri = menuUri; + menuInfo.menuName = menuName; + menuInfo.menuSortOrder = menuSortOrder; + return menuInfo; + } + } + } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java index ae69d8d..5f07459 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java @@ -7,11 +7,16 @@ import com.bpgroup.poc.admin.domain.admin.AdministratorRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Comparator; +import java.util.LinkedHashSet; import java.util.Optional; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor +@Transactional public class LoginService { private final AdministratorRepository loginRepository; @@ -32,8 +37,27 @@ public class LoginService { administrator.get().getId(), administrator.get().getLoginId(), administrator.get().getName(), - administrator.get().getLoginId() + administrator.get().getLoginId(), + getMenus(administrator.get()) ); } + private static LinkedHashSet getMenus(Administrator administrator) { + return administrator.getAdministratorRole().getRole().getRoleMenus().stream() + .map(roleMenu -> LoginResult.MenuInfo.of( + roleMenu.getMenu().getMenuGroup().getUri(), + roleMenu.getMenu().getMenuGroup().getName(), + roleMenu.getMenu().getMenuGroup().getSortOrder(), + roleMenu.getMenu().getUri(), + roleMenu.getMenu().getName(), + roleMenu.getMenu().getSortOrder() + )) + .sorted( + Comparator + .comparingInt(LoginResult.MenuInfo::getMenuGroupSortOrder) + .thenComparingInt(LoginResult.MenuInfo::getMenuSortOrder) + ) + .collect(Collectors.toCollection(LinkedHashSet::new)); + } + } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java index 35b35af..054d477 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java @@ -1,14 +1,29 @@ package com.bpgroup.poc.admin.domain.admin; -import lombok.RequiredArgsConstructor; +import com.bpgroup.poc.admin.domain.BaseEntity; +import jakarta.persistence.*; +import lombok.Getter; -@RequiredArgsConstructor -public enum Menu { - ADMINISTRATOR_MANAGEMENT("/admin/management", "관리자 관리"), - ROLE_MANAGEMENT("/admin/role", "권한 관리"), - MENU_MANAGEMENT("/admin/menu", "메뉴 관리") - ; +@Getter +@Entity +@Table(name = "menu") +public class Menu extends BaseEntity { - private final String uri; - private final String name; -} \ No newline at end of file + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "uri", length = 100, nullable = false) + private String uri; + + @Column(name = "name", length = 100, nullable = false) + private String name; + + @Column(name = "sort_order", nullable = false) + private Integer sortOrder; + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinColumn(name = "menu_group_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private MenuGroup menuGroup; + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuGroup.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuGroup.java new file mode 100644 index 0000000..cfba4f3 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuGroup.java @@ -0,0 +1,25 @@ +package com.bpgroup.poc.admin.domain.admin; + +import com.bpgroup.poc.admin.domain.BaseEntity; +import jakarta.persistence.*; +import lombok.Getter; + +@Getter +@Entity +@Table(name = "menu_group") +public class MenuGroup extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "uri", length = 100, nullable = false) + private String uri; + + @Column(name = "name", length = 100, nullable = false) + private String name; + + @Column(name = "sort_order", nullable = false) + private Integer sortOrder; + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuRepository.java new file mode 100644 index 0000000..9ce7974 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuRepository.java @@ -0,0 +1,6 @@ +package com.bpgroup.poc.admin.domain.admin; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MenuRepository extends JpaRepository { +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java index 02a6a23..3d9e3df 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java @@ -2,10 +2,12 @@ package com.bpgroup.poc.admin.domain.admin; import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; +import lombok.Getter; -import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; +import java.util.Set; +@Getter @Entity @Table(name = "role") public class Role extends BaseEntity { @@ -21,6 +23,6 @@ public class Role extends BaseEntity { private String description; @OneToMany(mappedBy = "role", fetch = FetchType.LAZY) - private List roleMenus = new ArrayList<>(); + private Set roleMenus = new HashSet<>(); } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java index df8a1d4..4ebf40b 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java @@ -2,9 +2,11 @@ package com.bpgroup.poc.admin.domain.admin; import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; +import lombok.Getter; -@Table -@Entity(name = "role_menu") +@Getter +@Entity +@Table(name = "role_menu") public class RoleMenu extends BaseEntity { @Id @@ -15,8 +17,8 @@ public class RoleMenu extends BaseEntity { @JoinColumn(name = "role_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) private Role role; - @Enumerated(EnumType.STRING) - @Column(name = "menu", length = 100, nullable = false) + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinColumn(name = "menu_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) private Menu menu; } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/AuthenticationDetail.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/AuthenticationDetail.java index ce78b35..d702f7e 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/AuthenticationDetail.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/AuthenticationDetail.java @@ -1,7 +1,11 @@ package com.bpgroup.poc.admin.security.authentication; import com.bpgroup.poc.admin.app.login.LoginResult; +import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.ToString; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; @Getter public class AuthenticationDetail { @@ -11,12 +15,74 @@ public class AuthenticationDetail { private String name; private String email; + private MultiValueMap menus = new LinkedMultiValueMap<>(); + public static AuthenticationDetail from(LoginResult result) { AuthenticationDetail authenticationDetail = new AuthenticationDetail(); authenticationDetail.id = result.getId(); authenticationDetail.loginId = result.getLoginId(); authenticationDetail.name = result.getName(); authenticationDetail.email = result.getEmail(); + + result.getMenus().forEach(menu -> authenticationDetail.menus.add( + MenuOneDepth.of( + menu.getMenuGroupUri(), + menu.getMenuGroupName(), + menu.getMenuGroupSortOrder() + ), + MenuTwoDepth.of( + menu.getMenuUri(), + menu.getMenuName(), + menu.getMenuSortOrder() + ) + )); + return authenticationDetail; } + + /** + * EqualsAndHashCode annotattion이 없을 경우 MultiValueMap을 사용할 때 중복된 key를 찾지 못함 + */ + @Getter + @ToString + @EqualsAndHashCode + private static class MenuOneDepth { + private String uri; + private String name; + private Integer sortOrder; + + public static MenuOneDepth of( + String uri, + String name, + Integer sortOrder + ) { + MenuOneDepth menu = new MenuOneDepth(); + menu.uri = uri; + menu.name = name; + menu.sortOrder = sortOrder; + return menu; + } + + } + + @Getter + @ToString + private static class MenuTwoDepth { + private String uri; + private String name; + private Integer sortOrder; + + public static MenuTwoDepth of( + String uri, + String name, + Integer sortOrder + ) { + MenuTwoDepth menu = new MenuTwoDepth(); + menu.uri = uri; + menu.name = name; + menu.sortOrder = sortOrder; + return menu; + } + } + } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/values/AdministratorMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/values/AdministratorMenu.java new file mode 100644 index 0000000..f485fd3 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/values/AdministratorMenu.java @@ -0,0 +1,4 @@ +package com.bpgroup.poc.admin.values; + +public class AdministratorMenu { +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/login/LoginController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/login/LoginController.java index 0db4d8a..79e5d0a 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/login/LoginController.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/login/LoginController.java @@ -4,12 +4,14 @@ import com.bpgroup.poc.admin.security.authentication.AuthenticationFailReason; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @Controller +@RequestMapping("/login") public class LoginController { - @GetMapping("/login") + @GetMapping public String loginPage( @RequestParam(required = false) AuthenticationFailReason error, Model model diff --git a/poc/admin/src/main/resources/application-local.yml b/poc/admin/src/main/resources/application-local.yml index a33e61d..d51ea7f 100644 --- a/poc/admin/src/main/resources/application-local.yml +++ b/poc/admin/src/main/resources/application-local.yml @@ -4,7 +4,7 @@ spring: mode: always datasource: - url: jdbc:mariadb://localhost:3307/login + url: jdbc:mariadb://localhost:3307/admin-system username: admin password: 1234 driver-class-name: org.mariadb.jdbc.Driver diff --git a/poc/admin/src/main/resources/application.yml b/poc/admin/src/main/resources/application.yml index 175c5f5..b7e819b 100644 --- a/poc/admin/src/main/resources/application.yml +++ b/poc/admin/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: application: - name: login + name: admin profiles: default: local \ No newline at end of file diff --git a/poc/admin/src/main/resources/data.sql b/poc/admin/src/main/resources/data.sql index 259b787..b587923 100644 --- a/poc/admin/src/main/resources/data.sql +++ b/poc/admin/src/main/resources/data.sql @@ -1,5 +1,6 @@ INSERT INTO `administrator` (`login_id`, `password`, `email`, `name`, `create_date`, `update_date`) -VALUES ('admin', '$2a$10$g6UOrQ/OS8o5r5CJk7C5juVFaItQ62U3EIn8zLPzkFplM3wVLvKZ2', 'admin@admin.com', '홍길동', CURDATE(), CURDATE()); +VALUES ('admin', '$2a$10$g6UOrQ/OS8o5r5CJk7C5juVFaItQ62U3EIn8zLPzkFplM3wVLvKZ2', 'admin@admin.com', '홍길동', CURDATE(), + CURDATE()); INSERT INTO `role` (`name`, `description`, `create_date`, `update_date`) VALUES ('SUPER_ADMIN', '최고 관리자', CURDATE(), CURDATE()), @@ -9,9 +10,47 @@ VALUES ('SUPER_ADMIN', '최고 관리자', CURDATE(), CURDATE()), INSERT INTO `administrator_role` (`administrator_id`, `role_id`, `create_date`, `update_date`) VALUES ('1', '1', CURDATE(), CURDATE()); -INSERT INTO `role_menu` (`role_id`, `menu`, `create_date`, `update_date`) -VALUES ('1', 'ADMINISTRATOR_MANAGEMENT', CURDATE(), CURDATE()), - ('1', 'ROLE_MANAGEMENT', CURDATE(), CURDATE()), - ('1', 'MENU_MANAGEMENT', CURDATE(), CURDATE()); +INSERT INTO `menu_group` (`uri`, `name`, `sort_order`, `create_date`, `update_date`) +VALUES ('/admin', '관리자 관리', 2, CURDATE(), CURDATE()), + ('/settings', '설정', 3, CURDATE(), CURDATE()), + ('/temp', '임시', 1, CURDATE(), CURDATE()); + +INSERT INTO `menu` (`uri`, `name`, `sort_order`, `menu_group_id`, `create_date`, `update_date`) +VALUES ('/admin/management', '관리자 관리', 1, 1, CURDATE(), CURDATE()), + ('/admin/role', '권한 관리', 2, 1, CURDATE(), CURDATE()), + ('/admin/temp01', '관리자 임시 1', 4, 1, CURDATE(), CURDATE()), + ('/admin/temp02', '관리자 임시 2', 3, 1, CURDATE(), CURDATE()) +; + +INSERT INTO `menu` (`uri`, `name`, `sort_order`, `menu_group_id`, `create_date`, `update_date`) +VALUES ('/temp/temp01', '임시 01', 4, 3, CURDATE(), CURDATE()), + ('/temp/temp02', '임시 02', 2, 3, CURDATE(), CURDATE()), + ('/temp/temp03', '임시 03', 1, 3, CURDATE(), CURDATE()), + ('/temp/temp04', '임시 04', 3, 3, CURDATE(), CURDATE()) +; + + +INSERT INTO `menu` (`uri`, `name`, `sort_order`, `menu_group_id`, `create_date`, `update_date`) +VALUES ('/settings/code', '코드 관리', 1, 2, CURDATE(), CURDATE()), + ('/settings/component', '컴포넌트', 1, 2, CURDATE(), CURDATE()), + ('/settings/temp01', '세팅 임시 1', 4, 2, CURDATE(), CURDATE()), + ('/settings/temp02', '세팅 임시 2', 3, 2, CURDATE(), CURDATE()) +; + +INSERT INTO `role_menu` (`role_id`, `menu_id`, `create_date`, `update_date`) +VALUES ('1', '1', CURDATE(), CURDATE()), + ('1', '2', CURDATE(), CURDATE()), + ('1', '3', CURDATE(), CURDATE()), + ('1', '4', CURDATE(), CURDATE()), + ('1', '5', CURDATE(), CURDATE()), + ('1', '6', CURDATE(), CURDATE()), + ('1', '7', CURDATE(), CURDATE()), + ('1', '8', CURDATE(), CURDATE()), + ('1', '9', CURDATE(), CURDATE()), + ('1', '10', CURDATE(), CURDATE()), + ('1', '11', CURDATE(), CURDATE()), + ('1', '12', CURDATE(), CURDATE()) +; + diff --git a/poc/admin/src/main/resources/templates/layout/lnb.html b/poc/admin/src/main/resources/templates/layout/lnb.html index bf7f63e..05df06e 100644 --- a/poc/admin/src/main/resources/templates/layout/lnb.html +++ b/poc/admin/src/main/resources/templates/layout/lnb.html @@ -6,18 +6,20 @@ - + \ No newline at end of file From e3c4fa132f58067d57c53b34b2569035676cbf00 Mon Sep 17 00:00:00 2001 From: geonhos Date: Thu, 9 May 2024 14:32:49 +0900 Subject: [PATCH 4/6] =?UTF-8?q?admin=20entity=20package=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/admin/{ => entity}/Administrator.java | 13 ++++++++++++- .../admin/{ => entity}/AdministratorRepository.java | 2 +- .../admin/{ => entity}/AdministratorRole.java | 2 +- .../poc/admin/domain/admin/{ => entity}/Menu.java | 2 +- .../admin/domain/admin/{ => entity}/MenuGroup.java | 2 +- .../domain/admin/{ => entity}/MenuRepository.java | 2 +- .../poc/admin/domain/admin/{ => entity}/Role.java | 2 +- .../admin/domain/admin/{ => entity}/RoleMenu.java | 2 +- .../domain/admin/{ => entity}/RoleRepository.java | 2 +- 9 files changed, 20 insertions(+), 9 deletions(-) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/Administrator.java (63%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/AdministratorRepository.java (82%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/AdministratorRole.java (93%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/Menu.java (93%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/MenuGroup.java (91%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/MenuRepository.java (72%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/Role.java (91%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/RoleMenu.java (92%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/{ => entity}/RoleRepository.java (72%) diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Administrator.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java similarity index 63% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Administrator.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java index d82129c..e28bb3d 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Administrator.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java @@ -1,7 +1,8 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; +import lombok.Builder; import lombok.Getter; @Getter @@ -28,4 +29,14 @@ public class Administrator extends BaseEntity { @OneToOne(mappedBy = "administrator", fetch = FetchType.LAZY) private AdministratorRole administratorRole; + @Builder + public static Administrator of(String loginId, String password, String email, String name) { + Administrator administrator = new Administrator(); + administrator.loginId = loginId; + administrator.password = password; + administrator.email = email; + administrator.name = name; + return administrator; + } + } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRepository.java similarity index 82% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRepository.java index ec88f1e..b81a4ad 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRole.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRole.java similarity index 93% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRole.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRole.java index bb26a09..29540a5 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/AdministratorRole.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRole.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Menu.java similarity index 93% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Menu.java index 054d477..9ccb75c 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Menu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Menu.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuGroup.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroup.java similarity index 91% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuGroup.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroup.java index cfba4f3..7241ae2 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuGroup.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroup.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuRepository.java similarity index 72% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuRepository.java index 9ce7974..c3d12dd 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/MenuRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java similarity index 91% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java index 3d9e3df..b6f4254 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/Role.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleMenu.java similarity index 92% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleMenu.java index 4ebf40b..0779612 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleMenu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleMenu.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleRepository.java similarity index 72% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleRepository.java index 449da60..3747729 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/RoleRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin; +package com.bpgroup.poc.admin.domain.admin.entity; import org.springframework.data.jpa.repository.JpaRepository; From 2edb4c831f9247c228da1f2339c70819933e7b8b Mon Sep 17 00:00:00 2001 From: geonhos Date: Fri, 10 May 2024 09:48:21 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20CRUD=20Sample=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poc/admin/build.gradle | 10 +- .../poc/admin/app/login/LoginService.java | 43 ++--- .../exception/DoNotHaveAnyMenuException.java | 7 + .../poc/admin/config/QuerydslConfig.java | 19 +++ .../poc/admin/domain/DomainException.java | 7 + .../domain/admin/entity/Administrator.java | 6 + .../service/AdministratorCreateCommand.java | 42 +++++ .../admin/service/AdministratorService.java | 51 ++++++ .../service/AdministratorUpdateCommand.java | 42 +++++ .../DuplicationAdministratorException.java | 7 + .../NotFoundAdministratorException.java | 9 + .../poc/admin/security/SecurityConfig.java | 11 +- .../AuthenticationFailReason.java | 4 + .../poc/admin/web/common/CommonResponse.java | 8 + .../poc/admin/web/login/LoginController.java | 3 +- ...dministratorManagementQueryRepository.java | 40 +++++ ...AdministratorManagementRestController.java | 83 +++++++++ .../AdministratorManagementWebService.java | 61 +++++++ .../reqres/AdministratorCreate.java | 51 ++++++ .../reqres/AdministratorDelete.java | 14 ++ .../management/reqres/AdministratorFind.java | 17 ++ .../reqres/AdministratorUpdate.java | 27 +++ poc/admin/src/main/resources/data.sql | 28 +-- .../templates/fragment/csrf/csrf.html | 28 ++- .../templates/main/admin/management/list.html | 161 ++++++++++++++++++ 25 files changed, 720 insertions(+), 59 deletions(-) create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/DoNotHaveAnyMenuException.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/config/QuerydslConfig.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/DomainException.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorCreateCommand.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorService.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorUpdateCommand.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/DuplicationAdministratorException.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/NotFoundAdministratorException.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/common/CommonResponse.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementRestController.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementWebService.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorCreate.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorDelete.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorFind.java create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorUpdate.java diff --git a/poc/admin/build.gradle b/poc/admin/build.gradle index 90325d8..b5451fc 100644 --- a/poc/admin/build.gradle +++ b/poc/admin/build.gradle @@ -16,7 +16,10 @@ repositories { } dependencies { + // spring implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' testImplementation 'org.springframework.boot:spring-boot-starter-test' // thymeleaf @@ -24,8 +27,11 @@ dependencies { implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0' - // jpa - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + //querydsl + implementation "com.querydsl:querydsl-jpa:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" + annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" // security implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java index 5f07459..35535b0 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java @@ -1,9 +1,10 @@ package com.bpgroup.poc.admin.app.login; import com.bpgroup.poc.admin.app.login.exception.AdministratorNotFoundException; +import com.bpgroup.poc.admin.app.login.exception.DoNotHaveAnyMenuException; import com.bpgroup.poc.admin.app.login.exception.InvalidPasswordException; -import com.bpgroup.poc.admin.domain.admin.Administrator; -import com.bpgroup.poc.admin.domain.admin.AdministratorRepository; +import com.bpgroup.poc.admin.domain.admin.entity.Administrator; +import com.bpgroup.poc.admin.domain.admin.entity.AdministratorRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -22,7 +23,7 @@ public class LoginService { private final AdministratorRepository loginRepository; private final PasswordEncoder passwordEncoder; - public LoginResult login(String loginId, String pwd) throws AdministratorNotFoundException, InvalidPasswordException { + public LoginResult login(String loginId, String pwd) throws AdministratorNotFoundException, InvalidPasswordException, DoNotHaveAnyMenuException { Optional administrator = loginRepository.findByLoginId(loginId); if (administrator.isEmpty()) { @@ -42,22 +43,26 @@ public class LoginService { ); } - private static LinkedHashSet getMenus(Administrator administrator) { - return administrator.getAdministratorRole().getRole().getRoleMenus().stream() - .map(roleMenu -> LoginResult.MenuInfo.of( - roleMenu.getMenu().getMenuGroup().getUri(), - roleMenu.getMenu().getMenuGroup().getName(), - roleMenu.getMenu().getMenuGroup().getSortOrder(), - roleMenu.getMenu().getUri(), - roleMenu.getMenu().getName(), - roleMenu.getMenu().getSortOrder() - )) - .sorted( - Comparator - .comparingInt(LoginResult.MenuInfo::getMenuGroupSortOrder) - .thenComparingInt(LoginResult.MenuInfo::getMenuSortOrder) - ) - .collect(Collectors.toCollection(LinkedHashSet::new)); + private static LinkedHashSet getMenus(Administrator administrator) throws DoNotHaveAnyMenuException { + try { + return administrator.getAdministratorRole().getRole().getRoleMenus().stream() + .map(roleMenu -> LoginResult.MenuInfo.of( + roleMenu.getMenu().getMenuGroup().getUri(), + roleMenu.getMenu().getMenuGroup().getName(), + roleMenu.getMenu().getMenuGroup().getSortOrder(), + roleMenu.getMenu().getUri(), + roleMenu.getMenu().getName(), + roleMenu.getMenu().getSortOrder() + )) + .sorted( + Comparator + .comparingInt(LoginResult.MenuInfo::getMenuGroupSortOrder) + .thenComparingInt(LoginResult.MenuInfo::getMenuSortOrder) + ) + .collect(Collectors.toCollection(LinkedHashSet::new)); + } catch (NullPointerException e) { + throw new DoNotHaveAnyMenuException(); + } } } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/DoNotHaveAnyMenuException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/DoNotHaveAnyMenuException.java new file mode 100644 index 0000000..82690a5 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/DoNotHaveAnyMenuException.java @@ -0,0 +1,7 @@ +package com.bpgroup.poc.admin.app.login.exception; + +public class DoNotHaveAnyMenuException extends Exception { + public DoNotHaveAnyMenuException() { + super(); + } +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/config/QuerydslConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/config/QuerydslConfig.java new file mode 100644 index 0000000..3c3f956 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/config/QuerydslConfig.java @@ -0,0 +1,19 @@ +package com.bpgroup.poc.admin.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QuerydslConfig { + + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/DomainException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/DomainException.java new file mode 100644 index 0000000..d7f046c --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/DomainException.java @@ -0,0 +1,7 @@ +package com.bpgroup.poc.admin.domain; + +public class DomainException extends RuntimeException { + public DomainException() { + super(); + } +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java index e28bb3d..f7fc3aa 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java @@ -39,4 +39,10 @@ public class Administrator extends BaseEntity { return administrator; } + public void update(Administrator administrator) { + this.password = administrator.password; + this.email = administrator.email; + this.name = administrator.name; + } + } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorCreateCommand.java new file mode 100644 index 0000000..39d3f74 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorCreateCommand.java @@ -0,0 +1,42 @@ +package com.bpgroup.poc.admin.domain.admin.service; + +import com.bpgroup.poc.admin.domain.admin.entity.Administrator; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.ToString; + +@Getter +@ToString +public class AdministratorCreateCommand { + + @NotBlank + private String loginId; + + @NotBlank + private String password; + + @NotBlank + private String email; + + @NotBlank + private String name; + + public static AdministratorCreateCommand of(String loginId, String password, String email, String name) { + AdministratorCreateCommand command = new AdministratorCreateCommand(); + command.loginId = loginId; + command.password = password; + command.email = email; + command.name = name; + return command; + } + + public Administrator toEntity() { + return Administrator.builder() + .loginId(loginId) + .password(password) + .email(email) + .name(name) + .build(); + } + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorService.java new file mode 100644 index 0000000..008cbb6 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorService.java @@ -0,0 +1,51 @@ +package com.bpgroup.poc.admin.domain.admin.service; + +import com.bpgroup.poc.admin.domain.admin.entity.Administrator; +import com.bpgroup.poc.admin.domain.admin.entity.AdministratorRepository; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +@Validated +@Transactional +public class AdministratorService { + + private final AdministratorRepository administratorRepository; + + public Long create( + @NotNull @Valid AdministratorCreateCommand command + ) { + // 대소문자 구별이 필요한 경우 인증 부분과 유효성 검사 부분 모두 변경이 필요하다. + Optional administrator = administratorRepository.findByLoginId(command.getLoginId()); + if (administrator.isPresent()) { + throw new DuplicationAdministratorException(command.getLoginId()); + } + + Administrator createAdministrator = administratorRepository.save(command.toEntity()); + return createAdministrator.getId(); + } + + public void update( + @NotNull @Valid AdministratorUpdateCommand command + ) { + Optional administrator = administratorRepository.findById(command.getId()); + if (administrator.isEmpty()) { + throw new NotFoundAdministratorException(); + } + + administrator.get().update(command.toEntity()); + } + + public void delete( + @NotNull Long id + ) { + administratorRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorUpdateCommand.java new file mode 100644 index 0000000..062c04a --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorUpdateCommand.java @@ -0,0 +1,42 @@ +package com.bpgroup.poc.admin.domain.admin.service; + +import com.bpgroup.poc.admin.domain.admin.entity.Administrator; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.ToString; + +@Getter +@ToString +public class AdministratorUpdateCommand { + + @NotNull + private Long id; + + @NotBlank + private String password; + + @NotBlank + private String email; + + @NotBlank + private String name; + + public static AdministratorUpdateCommand of(Long id, String password, String email, String name) { + AdministratorUpdateCommand command = new AdministratorUpdateCommand(); + command.id = id; + command.password = password; + command.email = email; + command.name = name; + return command; + } + + public Administrator toEntity() { + return Administrator.builder() + .password(password) + .email(email) + .name(name) + .build(); + } + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/DuplicationAdministratorException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/DuplicationAdministratorException.java new file mode 100644 index 0000000..096ff82 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/DuplicationAdministratorException.java @@ -0,0 +1,7 @@ +package com.bpgroup.poc.admin.domain.admin.service; + +public class DuplicationAdministratorException extends RuntimeException { + public DuplicationAdministratorException(String loginId) { + super("이미 존재하는 아이디 입니다. : " + loginId); + } +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/NotFoundAdministratorException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/NotFoundAdministratorException.java new file mode 100644 index 0000000..103abc3 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/NotFoundAdministratorException.java @@ -0,0 +1,9 @@ +package com.bpgroup.poc.admin.domain.admin.service; + +import com.bpgroup.poc.admin.domain.DomainException; + +public class NotFoundAdministratorException extends DomainException { + public NotFoundAdministratorException() { + super(); + } +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java index 9261d37..04a2ead 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java @@ -37,12 +37,11 @@ public class SecurityConfig { }).addFilterAfter(new CsrfCookieFilter(), BasicAuthenticationFilter.class); // 로그인이 완료된 후 CSRF Filter 를 실행 // 인증 설정 - http.authorizeHttpRequests(c -> { - c.requestMatchers("/css/**", "/images/**", "/js/**").permitAll() - .requestMatchers("/common/modal/**").permitAll() - .requestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH).permitAll() - .anyRequest().authenticated(); - }); + http.authorizeHttpRequests(c -> c + .requestMatchers("/css/**", "/images/**", "/js/**").permitAll() + .requestMatchers("/common/modal/**").permitAll() + .requestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH).permitAll() + .anyRequest().authenticated()); http.formLogin(c -> c .loginPage(LOGIN_PATH) diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/AuthenticationFailReason.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/AuthenticationFailReason.java index 26cfb1c..3240105 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/AuthenticationFailReason.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/AuthenticationFailReason.java @@ -1,6 +1,7 @@ package com.bpgroup.poc.admin.security.authentication; import com.bpgroup.poc.admin.app.login.exception.AdministratorNotFoundException; +import com.bpgroup.poc.admin.app.login.exception.DoNotHaveAnyMenuException; import com.bpgroup.poc.admin.app.login.exception.InvalidPasswordException; import lombok.extern.slf4j.Slf4j; @@ -8,11 +9,14 @@ import lombok.extern.slf4j.Slf4j; public enum AuthenticationFailReason { WRONG_LOGIN_ID, WRONG_PASSWORD, + HAVE_NO_MENU, INTERNAL_ERROR; public static AuthenticationFailReason from(Exception e) { if (e instanceof AdministratorNotFoundException || e instanceof InvalidPasswordException) { return WRONG_LOGIN_ID; + } else if (e instanceof DoNotHaveAnyMenuException) { + return HAVE_NO_MENU; } else { return INTERNAL_ERROR; } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/common/CommonResponse.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/common/CommonResponse.java new file mode 100644 index 0000000..ca06769 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/common/CommonResponse.java @@ -0,0 +1,8 @@ +package com.bpgroup.poc.admin.web.common; + +public class CommonResponse { + + protected String resultCode; + protected String resultMessage; + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/login/LoginController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/login/LoginController.java index 79e5d0a..e7761e5 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/login/LoginController.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/login/LoginController.java @@ -26,7 +26,8 @@ public class LoginController { private String getMessage(AuthenticationFailReason error) { return switch (error) { case WRONG_LOGIN_ID, WRONG_PASSWORD -> "아이디 또는 비밀번호가 일치하지 않습니다."; - case INTERNAL_ERROR -> "서버에 오류가 발생했습니다."; + case HAVE_NO_MENU -> "등록된 메뉴가 없습니다.\n 메뉴 등록 후 이용해주세요."; + default -> "서버에 오류가 발생했습니다."; }; } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java new file mode 100644 index 0000000..2e223a8 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java @@ -0,0 +1,40 @@ +package com.bpgroup.poc.admin.web.main.admin.management; + +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorFind; +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; + +import static com.bpgroup.poc.admin.domain.admin.entity.QAdministrator.administrator; + +@Repository +@RequiredArgsConstructor +public class AdministratorManagementQueryRepository { + + private final JPAQueryFactory queryFactory; + + public List findAll() { + return queryFactory.select(Projections.fields(AdministratorFind.Response.class, + administrator.id, + administrator.loginId, + administrator.email, + administrator.name)) + .from(administrator) + .fetch(); + } + + public AdministratorFind.Response findByLoginId(String loginId) { + return queryFactory.select(Projections.fields(AdministratorFind.Response.class, + administrator.id, + administrator.loginId, + administrator.email, + administrator.name)) + .from(administrator) + .where(administrator.loginId.eq(loginId)) + .fetchOne(); + + } +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementRestController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementRestController.java new file mode 100644 index 0000000..3d35078 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementRestController.java @@ -0,0 +1,83 @@ +package com.bpgroup.poc.admin.web.main.admin.management; + +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorCreate; +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorDelete; +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorFind; +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorUpdate; +import jakarta.validation.constraints.NotBlank; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/management") +public class AdministratorManagementRestController { + + private final AdministratorManagementWebService administratorManagementWebService; + + /** + * 전체 조회 + * @return 응답 + */ + @GetMapping("/list") + public ResponseEntity getAdministrators() { + List response = administratorManagementWebService.findAll(); + return ResponseEntity.ok(response); + } + + /** + * 조회 + * @param loginId 관리자 ID + * @return 응답 + */ + @GetMapping("/{loginId}") + public ResponseEntity getAdministrator(@PathVariable @NotBlank String loginId) { + AdministratorFind.Response response = administratorManagementWebService.find(loginId); + return ResponseEntity.ok(response); + } + + /** + * 관리자 등록 + * @param request 요청 + * @param bindingResult Validation 결과 + * @return 응답 + */ + @PostMapping("/create") + public ResponseEntity createAdministrator( + @RequestBody @Validated AdministratorCreate.Request request, + BindingResult bindingResult + ) { + AdministratorCreate.Response response = administratorManagementWebService.create(request); + return ResponseEntity.ok(response); + } + + @PostMapping("/update") + public ResponseEntity updateAdministrator( + @RequestBody @Validated AdministratorUpdate.Request request, + BindingResult bindingResult + ) { + administratorManagementWebService.update(request); + return ResponseEntity.ok().build(); + } + + /** + * 관리자 삭제 + * @param request 요청 + * @param bindingResult Validation 결과 + * @return 응답 + */ + @PostMapping("/delete") + public ResponseEntity deleteAdministrator( + @RequestBody @Validated AdministratorDelete.Request request, + BindingResult bindingResult + ) { + administratorManagementWebService.delete(request); + return ResponseEntity.ok().build(); + } + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementWebService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementWebService.java new file mode 100644 index 0000000..03c6d50 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementWebService.java @@ -0,0 +1,61 @@ +package com.bpgroup.poc.admin.web.main.admin.management; + +import com.bpgroup.poc.admin.domain.admin.service.AdministratorCreateCommand; +import com.bpgroup.poc.admin.domain.admin.service.AdministratorService; +import com.bpgroup.poc.admin.domain.admin.service.AdministratorUpdateCommand; +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorCreate; +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorDelete; +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorFind; +import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorUpdate; +import jakarta.validation.constraints.NotBlank; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +@Transactional +public class AdministratorManagementWebService { + + private final PasswordEncoder passwordEncoder; + + private final AdministratorService administratorService; + private final AdministratorManagementQueryRepository administratorManagementQueryRepository; + + public AdministratorCreate.Response create(AdministratorCreate.Request request) { + Long id = administratorService.create(AdministratorCreateCommand.of( + request.getLoginId(), + passwordEncoder.encode(request.getPassword()), + request.getEmail(), + request.getName() + )); + + return AdministratorCreate.Response.builder() + .id(id) + .build(); + } + + public AdministratorFind.Response find(@NotBlank String loginId) { + return administratorManagementQueryRepository.findByLoginId(loginId); + } + + public void delete(AdministratorDelete.Request request) { + administratorService.delete(request.getId()); + } + + public void update(AdministratorUpdate.Request request) { + administratorService.update(AdministratorUpdateCommand.of( + request.getId(), + passwordEncoder.encode(request.getPassword()), + request.getEmail(), + request.getName() + )); + } + + public List findAll() { + return administratorManagementQueryRepository.findAll(); + } +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorCreate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorCreate.java new file mode 100644 index 0000000..11c455d --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorCreate.java @@ -0,0 +1,51 @@ +package com.bpgroup.poc.admin.web.main.admin.management.reqres; + +import com.bpgroup.poc.admin.web.common.CommonResponse; +import jakarta.validation.constraints.NotBlank; +import lombok.Builder; +import lombok.Data; +import lombok.Getter; +import lombok.ToString; + +public class AdministratorCreate { + + @Data + public static class Request { + @NotBlank + private String loginId; + + @NotBlank + private String password; + + @NotBlank + private String email; + + @NotBlank + private String name; + } + + @Getter + @ToString + public static class Response extends CommonResponse { + + private Long id; + + @Builder + public static Response success(Long id) { + Response response = new Response(); + response.resultCode = "0000"; + response.resultMessage = "Success"; + response.id = id; + return response; + } + + @Builder + public static Response fail() { + Response response = new Response(); + response.resultCode = "9999"; + response.resultMessage = "Fail"; + return response; + } + } + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorDelete.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorDelete.java new file mode 100644 index 0000000..624f988 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorDelete.java @@ -0,0 +1,14 @@ +package com.bpgroup.poc.admin.web.main.admin.management.reqres; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +public class AdministratorDelete { + + @Data + public static class Request { + @NotNull + private Long id; + } + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorFind.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorFind.java new file mode 100644 index 0000000..4168c0e --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorFind.java @@ -0,0 +1,17 @@ +package com.bpgroup.poc.admin.web.main.admin.management.reqres; + +import lombok.Getter; +import lombok.ToString; + +public class AdministratorFind { + + @Getter + @ToString + public static class Response { + private Long id; + private String loginId; + private String email; + private String name; + } + +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorUpdate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorUpdate.java new file mode 100644 index 0000000..1b5495c --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorUpdate.java @@ -0,0 +1,27 @@ +package com.bpgroup.poc.admin.web.main.admin.management.reqres; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +public class AdministratorUpdate { + + @Data + public static class Request { + @NotNull + private Long id; + + @NotBlank + private String username; + + @NotBlank + private String password; + + @NotBlank + private String email; + + @NotBlank + private String name; + } + +} diff --git a/poc/admin/src/main/resources/data.sql b/poc/admin/src/main/resources/data.sql index b587923..4c20415 100644 --- a/poc/admin/src/main/resources/data.sql +++ b/poc/admin/src/main/resources/data.sql @@ -17,39 +17,17 @@ VALUES ('/admin', '관리자 관리', 2, CURDATE(), CURDATE()), INSERT INTO `menu` (`uri`, `name`, `sort_order`, `menu_group_id`, `create_date`, `update_date`) VALUES ('/admin/management', '관리자 관리', 1, 1, CURDATE(), CURDATE()), - ('/admin/role', '권한 관리', 2, 1, CURDATE(), CURDATE()), - ('/admin/temp01', '관리자 임시 1', 4, 1, CURDATE(), CURDATE()), - ('/admin/temp02', '관리자 임시 2', 3, 1, CURDATE(), CURDATE()) + ('/admin/role', '권한 관리', 2, 1, CURDATE(), CURDATE()) ; INSERT INTO `menu` (`uri`, `name`, `sort_order`, `menu_group_id`, `create_date`, `update_date`) -VALUES ('/temp/temp01', '임시 01', 4, 3, CURDATE(), CURDATE()), - ('/temp/temp02', '임시 02', 2, 3, CURDATE(), CURDATE()), - ('/temp/temp03', '임시 03', 1, 3, CURDATE(), CURDATE()), - ('/temp/temp04', '임시 04', 3, 3, CURDATE(), CURDATE()) -; - - -INSERT INTO `menu` (`uri`, `name`, `sort_order`, `menu_group_id`, `create_date`, `update_date`) -VALUES ('/settings/code', '코드 관리', 1, 2, CURDATE(), CURDATE()), - ('/settings/component', '컴포넌트', 1, 2, CURDATE(), CURDATE()), - ('/settings/temp01', '세팅 임시 1', 4, 2, CURDATE(), CURDATE()), - ('/settings/temp02', '세팅 임시 2', 3, 2, CURDATE(), CURDATE()) +VALUES ('/settings/code', '코드 관리', 1, 2, CURDATE(), CURDATE()) ; INSERT INTO `role_menu` (`role_id`, `menu_id`, `create_date`, `update_date`) VALUES ('1', '1', CURDATE(), CURDATE()), ('1', '2', CURDATE(), CURDATE()), - ('1', '3', CURDATE(), CURDATE()), - ('1', '4', CURDATE(), CURDATE()), - ('1', '5', CURDATE(), CURDATE()), - ('1', '6', CURDATE(), CURDATE()), - ('1', '7', CURDATE(), CURDATE()), - ('1', '8', CURDATE(), CURDATE()), - ('1', '9', CURDATE(), CURDATE()), - ('1', '10', CURDATE(), CURDATE()), - ('1', '11', CURDATE(), CURDATE()), - ('1', '12', CURDATE(), CURDATE()) + ('1', '3', CURDATE(), CURDATE()) ; diff --git a/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html b/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html index 3cf213e..511db91 100644 --- a/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html +++ b/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html @@ -5,15 +5,31 @@ diff --git a/poc/admin/src/main/resources/templates/main/admin/management/list.html b/poc/admin/src/main/resources/templates/main/admin/management/list.html index bb3d4ab..69c43b0 100644 --- a/poc/admin/src/main/resources/templates/main/admin/management/list.html +++ b/poc/admin/src/main/resources/templates/main/admin/management/list.html @@ -4,10 +4,171 @@ layout:decorate="~{main/admin/management/root.html}"> +
+

관리자 등록

+
+ + + + + + +
+ +

관리자 조회

+
+ + + +
+ +

관리자 수정

+
+ + + + + + +
+ +

관리자 삭제

+
+ + + +
+
From 93cdaec42ecc3f95c6692b768a41eb42df167b0a Mon Sep 17 00:00:00 2001 From: geonhos Date: Fri, 10 May 2024 17:26:15 +0900 Subject: [PATCH 6/6] =?UTF-8?q?jquery=20=EC=9D=98=EC=A1=B4=EC=84=B1=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poc/admin/security/CsrfCookieFilter.java | 22 --- .../poc/admin/security/SecurityConfig.java | 14 -- .../main/resources/static/js/eventrouter.js | 19 +-- .../resources/static/js/httpinterceptor.js | 26 ++++ .../static/js/jquery/jquery-3.7.1.min.js | 2 - .../src/main/resources/static/js/motion.js | 68 ++++----- .../main/resources/static/js/pagehelper.js | 63 ++++---- .../src/main/resources/static/js/reqhelper.js | 142 +++++++++--------- .../templates/fragment/csrf/csrf.html | 27 ---- .../templates/fragment/modal/alert-modal.html | 24 +-- .../fragment/modal/confirm-modal.html | 30 ++-- .../templates/fragment/modal/page-modal.html | 20 ++- .../resources/templates/layout/common.html | 4 +- .../main/resources/templates/login/login.html | 13 +- .../templates/main/admin/management/list.html | 117 +++++++-------- 15 files changed, 278 insertions(+), 313 deletions(-) delete mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/security/CsrfCookieFilter.java create mode 100644 poc/admin/src/main/resources/static/js/httpinterceptor.js delete mode 100644 poc/admin/src/main/resources/static/js/jquery/jquery-3.7.1.min.js diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/CsrfCookieFilter.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/CsrfCookieFilter.java deleted file mode 100644 index 97a43e3..0000000 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/CsrfCookieFilter.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bpgroup.poc.admin.security; - -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.security.web.csrf.CsrfToken; -import org.springframework.web.filter.OncePerRequestFilter; - -import java.io.IOException; - -public class CsrfCookieFilter extends OncePerRequestFilter { - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - CsrfToken csrfToken = (CsrfToken) request.getAttribute(CsrfToken.class.getName()); - if (csrfToken != null) { - response.setHeader(csrfToken.getHeaderName(), csrfToken.getToken()); - } - - filterChain.doFilter(request, response); - } -} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java index 04a2ead..46a10e6 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java @@ -8,9 +8,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; -import org.springframework.security.web.csrf.CookieCsrfTokenRepository; -import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import java.util.Objects; @@ -25,17 +22,6 @@ public class SecurityConfig { @Bean SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { - // CSRF 설정 - CsrfTokenRequestAttributeHandler csrfTokenRequestAttributeHandler = new CsrfTokenRequestAttributeHandler(); - csrfTokenRequestAttributeHandler.setCsrfRequestAttributeName("_csrf"); - - http.csrf(c -> { - c.csrfTokenRequestHandler(csrfTokenRequestAttributeHandler) - .ignoringRequestMatchers("/common/modal/**") - .ignoringRequestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH) // CSRF 무시 URL 설정 - .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()); // CSRF 토큰을 쿠키에 저장 및 사용 가능 - }).addFilterAfter(new CsrfCookieFilter(), BasicAuthenticationFilter.class); // 로그인이 완료된 후 CSRF Filter 를 실행 - // 인증 설정 http.authorizeHttpRequests(c -> c .requestMatchers("/css/**", "/images/**", "/js/**").permitAll() diff --git a/poc/admin/src/main/resources/static/js/eventrouter.js b/poc/admin/src/main/resources/static/js/eventrouter.js index b0d3caa..4297c70 100644 --- a/poc/admin/src/main/resources/static/js/eventrouter.js +++ b/poc/admin/src/main/resources/static/js/eventrouter.js @@ -1,5 +1,5 @@ const EventRouter = { - _eventRouter: $({}), + _eventRouter: new EventTarget(), /** * 이벤트 발생 @@ -8,7 +8,8 @@ const EventRouter = { * @param {*=} data */ trigger(eventName, data) { - this._eventRouter.trigger(eventName, data); + const event = new CustomEvent(eventName, { detail: data }); + this._eventRouter.dispatchEvent(event); }, /** @@ -23,15 +24,7 @@ const EventRouter = { return; } - this._eventRouter.off(eventName); - this._eventRouter.on(eventName, func); + this._eventRouter.removeEventListener(eventName, func); + this._eventRouter.addEventListener(eventName, func); }, - - /** - * 현재 등록된 이벤트 조회 (디버깅용) - */ - logCurrentRegistered() { - const events = $._data(this._eventRouter[0], "events"); - console.log(events); - } -}; +}; \ No newline at end of file diff --git a/poc/admin/src/main/resources/static/js/httpinterceptor.js b/poc/admin/src/main/resources/static/js/httpinterceptor.js new file mode 100644 index 0000000..7bea4db --- /dev/null +++ b/poc/admin/src/main/resources/static/js/httpinterceptor.js @@ -0,0 +1,26 @@ +const originalFetch = window.fetch; + +/** + * csrf token 없을 경우 추가하는 fetch interceptor + * @param url + * @param options + * @returns {Promise} + */ +window.fetch = function(url, options) { + // CSRF 토큰 + const csrfToken = document.querySelector('meta[name="_csrf"]').getAttribute('content'); + const csrfHeader = document.querySelector('meta[name="_csrf_header"]').getAttribute('content'); + + if (options.headers) { + options.headers[csrfHeader] = csrfToken; + } else { + options.headers = { + [csrfHeader]: csrfToken, + ContentType: 'application/json', + method: options.method ? options.method : 'POST' + }; + } + + // 원래의 fetch 함수 호출 + return originalFetch.apply(this, arguments); +}; \ No newline at end of file diff --git a/poc/admin/src/main/resources/static/js/jquery/jquery-3.7.1.min.js b/poc/admin/src/main/resources/static/js/jquery/jquery-3.7.1.min.js deleted file mode 100644 index 7f37b5d..0000000 --- a/poc/admin/src/main/resources/static/js/jquery/jquery-3.7.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="
",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0 { document.documentElement.style.setProperty('--vh', `${window.innerHeight}px`) }; window.addEventListener('resize', setVh); setVh(); -$(document).on('touchstart', function () { +document.addEventListener('touchstart', function () { }); - // 콘텐츠영역 자동 높이 조절 -$(document).ready(function () { - // var headerHeight = $('header').outerHeight(); - // $('.wrapper').css('padding-top', headerHeight + 'px'); -}); - -$(document).ready(function () { +document.addEventListener('DOMContentLoaded', function () { setupAccordion(); // navigation 모바일 처리 - $('#toggleLink').click(function () { + document.querySelector('#toggleLink').addEventListener('click', function () { toggleMenu('.menu_wrap'); }); - $('.closeButton').click(function () { + document.querySelector('.closeButton').addEventListener('click', function () { closeMenu('.menu_wrap'); }); - //modal - $("#openModalBtn").click(function () { - openModal(); - }); - - $(".modal .close, .modal").click(function (e) { - if (e.target !== this) return; // 모달 내부를 클릭한 경우에는 닫히지 않도록 처리 - closeModal(); + document.querySelectorAll('.modal .close, .modal').forEach(function (element) { + element.addEventListener('click', function (e) { + if (e.target !== this) return; // 모달 내부를 클릭한 경우에는 닫히지 않도록 처리 + closeModal(); + }); }); }); - // 아코디언 function setupAccordion() { - $('.nav_tit').on('click', function () { - $(this).next('.nav_section').slideToggle(150); - $(this).toggleClass('active'); - $('.nav_section').not($(this).next('.nav_section')).slideUp(150); - $('.nav_tit').not($(this)).removeClass('active'); + document.querySelectorAll('.nav_tit').forEach(function (element) { + element.addEventListener('click', function () { + this.nextElementSibling.classList.toggle('active'); + document.querySelectorAll('.nav_section').forEach(function (section) { + if (section !== this.nextElementSibling) { + section.classList.remove('active'); + } else { + section.classList.toggle('active'); + } + }, this); + document.querySelectorAll('.nav_tit').forEach(function (tit) { + if (tit !== this) { + tit.classList.remove('active'); + } else { + tit.classList.toggle('active'); + } + }, this); + }); }); } - // navigation 모바일 처리 function toggleMenu(selector) { - $(selector).toggleClass('active'); + document.querySelector(selector).classList.toggle('active'); } function closeMenu(selector) { - $(selector).removeClass('active'); + document.querySelector(selector).classList.remove('active'); } - //modal 열기 닫기 function openModal() { - $(".modal").fadeIn(100); - $("body").css("overflow", "hidden"); + document.querySelector('.modal').style.display = 'block'; + document.body.style.overflow = 'hidden'; } function closeModal() { - $(".modal").fadeOut(100); - $("body").css("overflow", "auto"); -} + document.querySelector('.modal').style.display = 'none'; + document.body.style.overflow = 'auto'; +} \ No newline at end of file diff --git a/poc/admin/src/main/resources/static/js/pagehelper.js b/poc/admin/src/main/resources/static/js/pagehelper.js index 0032174..c282049 100644 --- a/poc/admin/src/main/resources/static/js/pagehelper.js +++ b/poc/admin/src/main/resources/static/js/pagehelper.js @@ -7,12 +7,12 @@ const PageHelper = { * @param confirmFunction */ showSimpleConfirmModal(message, confirmFunction) { - this.showConfirmModal({ - title: '확인', - message: message, - }, { - confirm: confirmFunction, - }) + this.showConfirmModal({ + title: '확인', + message: message, + }, { + confirm: confirmFunction, + }) }, /** @@ -52,7 +52,8 @@ const PageHelper = { */ showErrorModal(message, cancelFunction) { if (!cancelFunction) { - cancelFunction = () => {} + cancelFunction = () => { + } } this.showAlertModal({ @@ -71,7 +72,8 @@ const PageHelper = { */ showFinishModal(message, cancelFunction) { if (!cancelFunction) { - cancelFunction = () => {} + cancelFunction = () => { + } } this.showAlertModal({ @@ -117,7 +119,7 @@ const PageHelper = { * @param {string} params.contentSelector * @param {string} params.appendToSelector * @param {Object=} callbacks - * @param {function(jQuery)=} callbacks.success - modal body의 jquery 객체가 파라미터로 오는 success 콜백 함수 + * @param {function(Element)=} callbacks.success - 파라미터로 오는 success 콜백 함수 * @param {function(Object)=} callbacks.error - 에러 메세지가 파라미터로 오는 error 콜백 함수 * @param {function()=} callbacks.complete */ @@ -132,11 +134,19 @@ const PageHelper = { data: params.data, }, { success: function (res) { - const e = $(res); - const d = e.find(params.contentSelector); - d.appendTo(params.appendToSelector); - const s = e.find('script'); - s.appendTo('body'); + const p = new DOMParser(); + const e = p.parseFromString(res, 'text/html'); + + const d = e.querySelector(params.contentSelector); + document.body.appendChild(d); + + const sDiv = document.createElement('script'); + sDiv.setAttribute('data-page-modal', 'script'); + + const s = e.querySelector('script'); + sDiv.textContent = s.textContent; + document.body.appendChild(sDiv); + if (callbacks.success) callbacks.success(d); }, error: function (error) { @@ -163,20 +173,21 @@ const PageHelper = { callbacks = {}; } - $.ajax({ - url: params.url, - type: params.method, - data: params.data, - success: function (res) { - if (callbacks.success) callbacks.success(res); - }, - error: function (error) { + fetch(params.url, { + method: params.method, + body: new URLSearchParams(params.data) + }) + .then(response => response.text()) + .then(data => { + if (callbacks.success) callbacks.success(data); + }) + .catch(error => { console.error(error); if (callbacks.error) callbacks.error(error); - }, - complete: function () { + }) + .finally(() => { if (callbacks.complete) callbacks.complete(); - } - }); + }); + }, }; diff --git a/poc/admin/src/main/resources/static/js/reqhelper.js b/poc/admin/src/main/resources/static/js/reqhelper.js index 5a3c67d..5cbfbf4 100644 --- a/poc/admin/src/main/resources/static/js/reqhelper.js +++ b/poc/admin/src/main/resources/static/js/reqhelper.js @@ -1,81 +1,79 @@ -const ReqHelper = { +const Reqhelper = { /** - * - * @param {jQuery} form - * @param {Object=} callbacks - * @param {function(Object=)=} callbacks.success - * @param {function(Object)=} callbacks.error - * @param {function()=} callbacks.complete + * post json http request + * @param url request url + * @param data is not json stringify data + * @param sFunc success function + * @param eFunc error function + * @param fFunc finally function */ - reqByForm(form, callbacks) { - if (!(form instanceof jQuery)) { - throw new Error('form is not jQuery instance'); - } - if (!callbacks) { - callbacks = {}; - } - - const url = form.attr('action'); - const method = form.attr('method'); - const dataObj = form.serializeArray().reduce((obj, item) => { - obj[item.name] = item.value; - return obj; - }, {}); - - $.ajax({ - url: url, - type: method, - contentType: 'application/json', - data: JSON.stringify(dataObj), - success: function (res) { - if (!callbacks.success) return; - - res.isSuccess = () => res.resultCode === "0000"; - res.isFail = () => !res.isSuccess(); - res.getMessage = () => res.resultMsg || ''; - callbacks.success(res); - }, - error: function (error) { - if (callbacks.error) callbacks.error(error); - }, - complete: function () { - if (callbacks.complete) callbacks.complete(); + reqPostJson: function (url, data, sFunc, eFunc, fFunc) { + fetch(url, { + method: 'POST', + body: JSON.stringify(data), + headers: { + 'Content-Type': 'application/json' } - }); + }) + .then(response => { + if (!response.ok) { + throw new Error(response.statusText); + } + return response.text().then(text => text ? JSON.parse(text) : null); + }) + .then((data) => { + if (sFunc) { + sFunc(data); + } + }) + .catch((error) => { + if (eFunc) { + eFunc(error); + } + }) + .finally(() => { + if (fFunc) { + fFunc(); + } + }); }, - /** - * - * @param url - * @param sendData {Object=} - * @param {Object=} callbacks - * @param {function(Object=)=} callbacks.success - * @param {function(Object)=} callbacks.error - * @param {function()=} callbacks.complete + * get json http request + * @param url request url + * @param sFunc success function + * @param eFunc error function + * @param fFunc finally function */ - reqByObj(url, sendData, callbacks) { - if (!url) { - throw new Error('url is empty'); - } - if (!callbacks) { - callbacks = {}; - } - $.ajax({ - url: url, - type: "post", - contentType: 'application/json', - data: JSON.stringify(sendData), - success: function (res) { - if (callbacks.success) callbacks.success(res); - }, - error: function (error) { - if (callbacks.error) callbacks.error(error); - }, - complete: function () { - if (callbacks.complete) callbacks.complete(); + reqGetJson: function (url, sFunc, eFunc, fFunc) { + fetch(url, { + method: 'GET', + headers: { + 'Content-Type': 'application/json' } - }); - }, -}; + }) + .then(response => { + if (!response.ok) { + throw new Error(response.statusText); + } + return response.text().then(text => text ? JSON.parse(text) : null); + }) + .then((data) => { + if (sFunc) { + sFunc(data); + } + }) + .catch((error) => { + if (eFunc) { + eFunc(error); + } + }) + .finally(() => { + if (fFunc) { + fFunc(); + } + }); + } + +} \ No newline at end of file diff --git a/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html b/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html index 511db91..65e2368 100644 --- a/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html +++ b/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html @@ -4,33 +4,6 @@ - diff --git a/poc/admin/src/main/resources/templates/fragment/modal/alert-modal.html b/poc/admin/src/main/resources/templates/fragment/modal/alert-modal.html index c26fa3c..cf38d83 100644 --- a/poc/admin/src/main/resources/templates/fragment/modal/alert-modal.html +++ b/poc/admin/src/main/resources/templates/fragment/modal/alert-modal.html @@ -21,21 +21,25 @@ diff --git a/poc/admin/src/main/resources/templates/fragment/modal/confirm-modal.html b/poc/admin/src/main/resources/templates/fragment/modal/confirm-modal.html index 2f444b9..fd6384f 100644 --- a/poc/admin/src/main/resources/templates/fragment/modal/confirm-modal.html +++ b/poc/admin/src/main/resources/templates/fragment/modal/confirm-modal.html @@ -22,12 +22,12 @@ diff --git a/poc/admin/src/main/resources/templates/fragment/modal/page-modal.html b/poc/admin/src/main/resources/templates/fragment/modal/page-modal.html index 60f247b..1bffd7f 100644 --- a/poc/admin/src/main/resources/templates/fragment/modal/page-modal.html +++ b/poc/admin/src/main/resources/templates/fragment/modal/page-modal.html @@ -21,10 +21,12 @@ diff --git a/poc/admin/src/main/resources/templates/layout/common.html b/poc/admin/src/main/resources/templates/layout/common.html index 64dd0c5..989f341 100644 --- a/poc/admin/src/main/resources/templates/layout/common.html +++ b/poc/admin/src/main/resources/templates/layout/common.html @@ -6,15 +6,15 @@ 관리자 시스템 - - + + diff --git a/poc/admin/src/main/resources/templates/login/login.html b/poc/admin/src/main/resources/templates/login/login.html index f61a296..19a06d3 100644 --- a/poc/admin/src/main/resources/templates/login/login.html +++ b/poc/admin/src/main/resources/templates/login/login.html @@ -5,13 +5,14 @@ 시스템 - - + + +