").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
\ No newline at end of file
diff --git a/poc/admin/publish/js/motion.js b/poc/admin/publish/js/motion.js
new file mode 100644
index 0000000..651893c
--- /dev/null
+++ b/poc/admin/publish/js/motion.js
@@ -0,0 +1,88 @@
+
+
+// header 높이 만큼 body의 padding-top으로 설정
+
+window.addEventListener('load', function() {
+ var headerHeight = document.querySelector('header').offsetHeight;
+ document.body.style.paddingTop = headerHeight + 'px';
+});
+
+
+// Sidebar 열고 닫기
+
+function toggleSidebar() {
+ var sidebar = document.querySelector('.sidebar');
+ var contentHeader = document.querySelector('.content .con_header');
+ var toggleBtn = document.querySelector('.toggle-btn');
+
+ if (sidebar.style.width === '200px') {
+ sidebar.style.width = '0';
+ toggleBtn.classList.remove('active');
+ contentHeader.classList.remove('active');
+ } else {
+ sidebar.style.width = '200px';
+ toggleBtn.classList.add('active');
+ contentHeader.classList.add('active');
+ }
+}
+
+
+document.addEventListener("DOMContentLoaded", function() {
+
+ // Sidebar 아코디언 메뉴
+ const accordionItems = document.querySelectorAll('.accordion-header');
+
+ accordionItems.forEach(item => {
+ item.addEventListener('click', () => {
+ item.classList.toggle('active');
+ });
+ });
+
+ // INPUT 내용 삭제
+ document.querySelectorAll(".btn_clear").forEach(function(btn) {
+ btn.style.display = "none";
+ });
+
+ document.querySelectorAll(".inp input").forEach(function(input) {
+ input.addEventListener("input", function() {
+ var parentLabel = this.closest(".inp");
+ var clearButton = parentLabel.querySelector(".btn_clear");
+
+ if (this.value !== "") {
+ clearButton.style.display = "block";
+ } else {
+ clearButton.style.display = "none";
+ }
+ });
+ });
+
+ document.querySelectorAll(".btn_clear").forEach(function(btn) {
+ btn.addEventListener("click", function() {
+ var parentLabel = this.closest(".inp");
+ var input = parentLabel.querySelector("input");
+
+ input.value = "";
+ this.style.display = "none";
+ });
+ });
+
+
+ // 입력값 변경시 호출 함수 등록
+ document.querySelectorAll(".inp_states").forEach(function(inputElement) {
+ inputElement.addEventListener("input", function() {
+ removeErrorClass(this);
+ });
+ });
+
+ // 에러 클래스 제거 함수
+ function removeErrorClass(inputElement) {
+ if (inputElement.value.trim() !== "") {
+ inputElement.closest(".inp").classList.remove("err");
+ inputElement.nextElementSibling.style.display = "none";
+ }
+ }
+
+
+
+});
+
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
deleted file mode 100644
index 5195fbd..0000000
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginResult.java
+++ /dev/null
@@ -1,59 +0,0 @@
-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
-public class LoginResult {
- private Long id;
- private String loginId;
- private String name;
- private 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
deleted file mode 100644
index 35535b0..0000000
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/LoginService.java
+++ /dev/null
@@ -1,68 +0,0 @@
-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.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;
-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;
- private final PasswordEncoder passwordEncoder;
-
- public LoginResult login(String loginId, String pwd) throws AdministratorNotFoundException, InvalidPasswordException, DoNotHaveAnyMenuException {
-
- Optional administrator = loginRepository.findByLoginId(loginId);
- if (administrator.isEmpty()) {
- throw new AdministratorNotFoundException(loginId);
- }
-
- if (!passwordEncoder.matches(pwd, administrator.get().getPassword())) {
- throw new InvalidPasswordException(loginId);
- }
-
- return LoginResult.of(
- administrator.get().getId(),
- administrator.get().getLoginId(),
- administrator.get().getName(),
- administrator.get().getLoginId(),
- getMenus(administrator.get())
- );
- }
-
- 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/domain/admin/service/AdministratorCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/AdministratorCreateCommand.java
similarity index 91%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorCreateCommand.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/AdministratorCreateCommand.java
index 39d3f74..833eb36 100644
--- 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/command/AdministratorCreateCommand.java
@@ -1,7 +1,8 @@
-package com.bpgroup.poc.admin.domain.admin.service;
+package com.bpgroup.poc.admin.domain.admin.command;
import com.bpgroup.poc.admin.domain.admin.entity.Administrator;
import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
@@ -21,6 +22,7 @@ public class AdministratorCreateCommand {
@NotBlank
private String name;
+ @Builder
public static AdministratorCreateCommand of(String loginId, String password, String email, String name) {
AdministratorCreateCommand command = new AdministratorCreateCommand();
command.loginId = loginId;
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/command/AdministratorUpdateCommand.java
similarity index 94%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorUpdateCommand.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/AdministratorUpdateCommand.java
index 062c04a..54187c7 100644
--- 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/command/AdministratorUpdateCommand.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.domain.admin.service;
+package com.bpgroup.poc.admin.domain.admin.command;
import com.bpgroup.poc.admin.domain.admin.entity.Administrator;
import jakarta.validation.constraints.NotBlank;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/RoleCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/RoleCreateCommand.java
new file mode 100644
index 0000000..6d8aefa
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/RoleCreateCommand.java
@@ -0,0 +1,33 @@
+package com.bpgroup.poc.admin.domain.admin.command;
+
+import com.bpgroup.poc.admin.domain.admin.entity.Role;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+public class RoleCreateCommand {
+
+ @NotBlank
+ private String name;
+
+ private String description;
+
+ @Builder
+ public static RoleCreateCommand of(String name, String description) {
+ RoleCreateCommand command = new RoleCreateCommand();
+ command.name = name;
+ command.description = description;
+ return command;
+ }
+
+ public Role toEntity() {
+ return Role.builder()
+ .name(name)
+ .description(description)
+ .build();
+ }
+
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/RoleUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/RoleUpdateCommand.java
new file mode 100644
index 0000000..692493e
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/command/RoleUpdateCommand.java
@@ -0,0 +1,32 @@
+package com.bpgroup.poc.admin.domain.admin.command;
+
+import com.bpgroup.poc.admin.domain.admin.entity.Role;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+public class RoleUpdateCommand {
+
+ @NotBlank
+ private String name;
+
+ private String description;
+
+ @Builder
+ public static RoleUpdateCommand of(String name, String description) {
+ RoleUpdateCommand command = new RoleUpdateCommand();
+ command.name = name;
+ command.description = description;
+ return command;
+ }
+
+ public Role toEntity() {
+ return Role.builder()
+ .name(name)
+ .description(description)
+ .build();
+ }
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java
index b6f4254..b83381f 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java
@@ -2,6 +2,7 @@ package com.bpgroup.poc.admin.domain.admin.entity;
import com.bpgroup.poc.admin.domain.BaseEntity;
import jakarta.persistence.*;
+import lombok.Builder;
import lombok.Getter;
import java.util.HashSet;
@@ -25,4 +26,17 @@ public class Role extends BaseEntity {
@OneToMany(mappedBy = "role", fetch = FetchType.LAZY)
private Set roleMenus = new HashSet<>();
+ @Builder
+ public static Role of(String name, String description) {
+ Role role = new Role();
+ role.name = name;
+ role.description = description;
+ return role;
+
+ }
+
+ public void update(Role updateRole) {
+ this.name = updateRole.name;
+ this.description = updateRole.description;
+ }
}
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/exception/DuplicationAdministratorException.java
similarity index 80%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/DuplicationAdministratorException.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/DuplicationAdministratorException.java
index 096ff82..356b127 100644
--- 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/exception/DuplicationAdministratorException.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.domain.admin.service;
+package com.bpgroup.poc.admin.domain.admin.exception;
public class DuplicationAdministratorException extends RuntimeException {
public DuplicationAdministratorException(String 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/exception/NotFoundAdministratorException.java
similarity index 78%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/NotFoundAdministratorException.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/NotFoundAdministratorException.java
index 103abc3..2f2a2da 100644
--- 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/exception/NotFoundAdministratorException.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.domain.admin.service;
+package com.bpgroup.poc.admin.domain.admin.exception;
import com.bpgroup.poc.admin.domain.DomainException;
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
deleted file mode 100644
index 008cbb6..0000000
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdministratorService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-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/security/SecurityConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java
index 46a10e6..223e24a 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
@@ -1,16 +1,27 @@
package com.bpgroup.poc.admin.security;
-import com.bpgroup.poc.admin.common.FormatHelper;
-import com.bpgroup.poc.admin.security.authentication.AuthenticationFailException;
+import com.bpgroup.poc.admin.security.authentication.CustomAuthenticationFilter;
+import com.bpgroup.poc.admin.security.authentication.CustomAuthenticationProvider;
+import com.bpgroup.poc.admin.security.authentication.service.LoginService;
+import com.bpgroup.poc.admin.security.jwt.JwtTokenValidatorFilter;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+import org.springframework.security.web.header.writers.XXssProtectionHeaderWriter;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import java.util.Objects;
+import java.util.ArrayList;
+import java.util.List;
@Configuration
@RequiredArgsConstructor
@@ -20,28 +31,32 @@ public class SecurityConfig {
private static final String LOGOUT_PATH = "/logout";
private static final String ERROR_PATH = "/error";
+ private final LoginService loginService;
+
@Bean
SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception {
+
+ http.sessionManagement(t -> t.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
+
+ // 보안 기본 설정
+ http.headers(c -> c
+ .frameOptions(fo -> fo.sameOrigin()) // X-Frame-Options: Same Origin
+ .xssProtection(xp -> xp.headerValue(XXssProtectionHeaderWriter.HeaderValue.ENABLED_MODE_BLOCK)) // X-XSS-Protection: 1; mode=block
+ .contentTypeOptions(Customizer.withDefaults()) // X-Content-Type-Options: nosniff
+ .cacheControl(cache -> cache.disable()) //ERR_CACHE_MISS
+ );
+
// 인증 설정
http.authorizeHttpRequests(c -> c
- .requestMatchers("/css/**", "/images/**", "/js/**").permitAll()
+ .requestMatchers("/css/**", "/images/**", "/js/**", "/font/**").permitAll()
.requestMatchers("/common/modal/**").permitAll()
.requestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH).permitAll()
.anyRequest().authenticated());
- http.formLogin(c -> c
- .loginPage(LOGIN_PATH)
- .loginProcessingUrl(LOGIN_PATH)
- .usernameParameter("loginId")
- .passwordParameter("password")
- .defaultSuccessUrl("/main")
- .failureHandler((req, res, ex) -> {
- if (Objects.requireNonNull(ex) instanceof AuthenticationFailException authenticationFailException) {
- res.sendRedirect(FormatHelper.format(LOGIN_PATH + "?error={}", authenticationFailException.getReason()));
- } else {
- res.sendRedirect(ERROR_PATH);
- }
- }));
+ http.formLogin(AbstractHttpConfigurer::disable); // Form 로그인이 아닌 Json 로그인으로 분리
+ http.addFilterBefore(authenticationGenerateFilter(), UsernamePasswordAuthenticationFilter.class); // 로그인 관련 Filter 설정
+
+ http.addFilterAfter(new JwtTokenValidatorFilter(), BasicAuthenticationFilter.class);
http.logout(c -> c
.logoutRequestMatcher(new AntPathRequestMatcher(LOGOUT_PATH, "GET"))
@@ -51,12 +66,23 @@ public class SecurityConfig {
return http.build();
}
- /**
- * Bcrypt Version, Bcrypt Strength, Salt String 설정은 생성자를 이용하여 설정 가능
- */
@Bean
- public BCryptPasswordEncoder passwordEncoder() {
- return new BCryptPasswordEncoder();
+ public CustomAuthenticationProvider customAuthenticationProvider() {
+ return new CustomAuthenticationProvider(loginService);
+ }
+
+ @Bean
+ public AuthenticationManager authenticationManager() {
+ List providers = new ArrayList<>();
+ providers.add(customAuthenticationProvider());
+ return new ProviderManager(providers);
+ }
+
+ @Bean
+ public CustomAuthenticationFilter authenticationGenerateFilter() {
+ CustomAuthenticationFilter filter = new CustomAuthenticationFilter();
+ filter.setAuthenticationManager(authenticationManager());
+ return filter;
}
}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityEncryptConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityEncryptConfig.java
new file mode 100644
index 0000000..31fd7c6
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityEncryptConfig.java
@@ -0,0 +1,20 @@
+package com.bpgroup.poc.admin.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+/**
+ * SecurityConfig 에 있을 경우 Service 에 주입 시 순환 참조가 발생하여 별로 파일로 분리
+ */
+@Configuration
+public class SecurityEncryptConfig {
+ /**
+ * Bcrypt Version, Bcrypt Strength, Salt String 설정은 생성자를 이용하여 설정 가능
+ */
+ @Bean
+ public BCryptPasswordEncoder passwordEncoder() {
+ return new BCryptPasswordEncoder();
+ }
+
+}
\ No newline at end of file
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityFilterConstants.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityFilterConstants.java
new file mode 100644
index 0000000..00e0beb
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityFilterConstants.java
@@ -0,0 +1,5 @@
+package com.bpgroup.poc.admin.security;
+
+public class SecurityFilterConstants {
+ public static final String[] EXCLUDE_FILTER_STARTS_WITH_URI = {"/login", "/logout", "/error", "/css", "/js", "/images", "/favicon.ico", "/common/modal", "/font"};
+}
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 d702f7e..b79625f 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,87 +1,41 @@
package com.bpgroup.poc.admin.security.authentication;
-import com.bpgroup.poc.admin.app.login.LoginResult;
-import lombok.EqualsAndHashCode;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Builder;
import lombok.Getter;
-import lombok.ToString;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
+import lombok.NoArgsConstructor;
+
@Getter
+@NoArgsConstructor
public class AuthenticationDetail {
-
- private Long id;
private String loginId;
private String name;
private String email;
- private MultiValueMap menus = new LinkedMultiValueMap<>();
-
- public static AuthenticationDetail from(LoginResult result) {
+ @Builder
+ public static AuthenticationDetail of(String loginId, String name, String email) {
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()
- )
- ));
-
+ authenticationDetail.loginId = loginId;
+ authenticationDetail.name = name;
+ authenticationDetail.email = email;
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;
+ public String toJsonString() {
+ try {
+ return new ObjectMapper().writeValueAsString(this);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
}
-
}
- @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;
+ public static AuthenticationDetail fromJsonString(String jsonString) {
+ try {
+ return new ObjectMapper().readValue(jsonString, AuthenticationDetail.class);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
}
}
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 3240105..06adc93 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,20 +1,26 @@
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;
+import com.bpgroup.poc.admin.security.authentication.service.exception.AdministratorNotFoundException;
+import com.bpgroup.poc.admin.security.authentication.service.exception.DoNotHaveAnyMenuException;
+import com.bpgroup.poc.admin.security.authentication.service.exception.InvalidPasswordException;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
-@Slf4j
+@Getter
+@RequiredArgsConstructor
public enum AuthenticationFailReason {
- WRONG_LOGIN_ID,
- WRONG_PASSWORD,
- HAVE_NO_MENU,
- INTERNAL_ERROR;
+ WRONG_LOGIN_ID("아이디 및 패스워드를 확인하세요."),
+ WRONG_PASSWORD("아이디 및 패스워드를 확인하세요."),
+ HAVE_NO_MENU("등록된 메뉴 권한이 없습니다. \n메뉴 등록 후 사용하시기 바랍니다."),
+ INTERNAL_ERROR("서버 내부 오류가 발생했습니다.");
+
+ private final String message;
public static AuthenticationFailReason from(Exception e) {
- if (e instanceof AdministratorNotFoundException || e instanceof InvalidPasswordException) {
+ if (e instanceof AdministratorNotFoundException) {
return WRONG_LOGIN_ID;
+ } else if (e instanceof InvalidPasswordException) {
+ return WRONG_PASSWORD;
} else if (e instanceof DoNotHaveAnyMenuException) {
return HAVE_NO_MENU;
} else {
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationFailureHandler.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationFailureHandler.java
new file mode 100644
index 0000000..43e5f04
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationFailureHandler.java
@@ -0,0 +1,36 @@
+package com.bpgroup.poc.admin.security.authentication;
+
+import com.bpgroup.poc.admin.security.authentication.service.LoginResponse;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.http.MediaType;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+public class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler {
+ @Override
+ public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+ response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+ String failMessage = "시스템 오류가 발생했습니다.";
+
+ if (Objects.requireNonNull(exception) instanceof AuthenticationFailException authenticationFailException) {
+ failMessage = authenticationFailException.getReason().getMessage();
+ }
+
+ String jsonResponse = new ObjectMapper().writeValueAsString(
+ LoginResponse.fail(
+ "9999",
+ failMessage
+ )
+ );
+ response.getWriter().write(jsonResponse);
+ }
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationFilter.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationFilter.java
new file mode 100644
index 0000000..9a9d5b6
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationFilter.java
@@ -0,0 +1,68 @@
+package com.bpgroup.poc.admin.security.authentication;
+
+import com.bpgroup.poc.admin.security.authentication.service.LoginRequest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.authentication.AuthenticationServiceException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.util.StreamUtils;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+public class CustomAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
+ private static final String DEFAULT_LOGIN_REQUEST_URL = "/login";
+ private static final String HTTP_METHOD = "POST";
+ private static final String CONTENT_TYPE = "application/json";
+ private boolean postOnly = true;
+
+ public CustomAuthenticationFilter() {
+ super(new AntPathRequestMatcher(DEFAULT_LOGIN_REQUEST_URL, HTTP_METHOD)); // 위에서 설정한 /oauth2/login/* 의 요청에, GET으로 온 요청을 처리하기 위해 설정한다.
+ setAuthenticationSuccessHandler(new CustomAuthenticationSuccessHandler());
+ setAuthenticationFailureHandler(new CustomAuthenticationFailureHandler());
+ }
+
+ @Override
+ public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException, IOException, ServletException {
+ // 요청에 대한 유효성 검사
+ isValidated(request);
+
+ LoginRequest loginRequest = new ObjectMapper().readValue(
+ StreamUtils.copyToString(request.getInputStream(), StandardCharsets.UTF_8),
+ LoginRequest.class
+ );
+
+ String username = loginRequest.getUsername();
+ String password = loginRequest.getPassword();
+
+ if (username == null || password == null) {
+ throw new AuthenticationServiceException("DATA IS MISS");
+ }
+
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
+ setDetails(request, authenticationToken);
+
+ return this.getAuthenticationManager().authenticate(authenticationToken);
+ }
+
+ private void isValidated(HttpServletRequest request) {
+ if (this.postOnly && !request.getMethod().equals(HTTP_METHOD)) {
+ throw new AuthenticationServiceException("Authentication method not supported: " + request.getMethod());
+ }
+
+ if (request.getContentType() == null || !request.getContentType().equals(CONTENT_TYPE)) {
+ throw new AuthenticationServiceException("Authentication Content-Type not supported: " + request.getContentType());
+ }
+ }
+
+ protected void setDetails(HttpServletRequest request, UsernamePasswordAuthenticationToken authRequest) {
+ authRequest.setDetails(this.authenticationDetailsSource.buildDetails(request));
+ }
+
+}
\ No newline at end of file
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationProvider.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationProvider.java
index 562a71c..6f8eec6 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationProvider.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationProvider.java
@@ -1,27 +1,28 @@
package com.bpgroup.poc.admin.security.authentication;
-import com.bpgroup.poc.admin.app.login.LoginResult;
-import com.bpgroup.poc.admin.app.login.LoginService;
+import com.bpgroup.poc.admin.security.authentication.service.LoginResult;
+import com.bpgroup.poc.admin.security.authentication.service.LoginService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
-import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
-@Component
@RequiredArgsConstructor
public class CustomAuthenticationProvider implements AuthenticationProvider {
private final LoginService loginService;
+ @Transactional
@Override
public Authentication authenticate(Authentication authentication) throws AuthenticationException {
- String loginId = (String) authentication.getPrincipal();
- String password = (String) authentication.getCredentials();
-
try {
- LoginResult loginResult = loginService.login(loginId, password);
+ String username = (String) authentication.getPrincipal();
+ String password = (String) authentication.getCredentials();
+
+ LoginResult loginResult = loginService.login(username, password);
+
return buildAuthenticationToken(loginResult);
} catch (Exception e) {
throw new AuthenticationFailException("로그인에 실패하였습니다.", AuthenticationFailReason.from(e));
@@ -29,13 +30,22 @@ public class CustomAuthenticationProvider implements AuthenticationProvider {
}
private UsernamePasswordAuthenticationToken buildAuthenticationToken(LoginResult result) {
- UsernamePasswordAuthenticationToken authenticationToken = UsernamePasswordAuthenticationToken.authenticated(
+ UsernamePasswordAuthenticationToken token = UsernamePasswordAuthenticationToken.authenticated(
result.getLoginId(),
null,
null
);
- authenticationToken.setDetails(AuthenticationDetail.from(result));
- return authenticationToken;
+
+ token.setDetails(
+ AuthenticationDetail.builder()
+ .loginId(result.getLoginId())
+ .name(result.getName())
+ .email(result.getEmail())
+ .build()
+ .toJsonString()
+ );
+
+ return token;
}
@Override
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationSuccessHandler.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationSuccessHandler.java
new file mode 100644
index 0000000..e52bac0
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/CustomAuthenticationSuccessHandler.java
@@ -0,0 +1,52 @@
+package com.bpgroup.poc.admin.security.authentication;
+
+import com.bpgroup.poc.admin.security.authentication.service.LoginResponse;
+import com.bpgroup.poc.admin.security.jwt.JwtConstants;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.http.MediaType;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+
+import javax.crypto.SecretKey;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+public class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
+ @Override
+ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException {
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+ response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+
+ // JWT 토큰을 쿠키에 추가
+ String jwtToken = createJwtToken(authentication);
+ Cookie jwtCookie = new Cookie(JwtConstants.JWT_TOKEN_NAME, jwtToken);
+ jwtCookie.setHttpOnly(true);
+ jwtCookie.setPath("/");
+ response.addCookie(jwtCookie);
+
+ String jsonResponse = new ObjectMapper().writeValueAsString(
+ LoginResponse.success()
+ );
+
+ response.getWriter().write(jsonResponse);
+ }
+
+ private static String createJwtToken(Authentication authentication) {
+ SecretKey key = Keys.hmacShaKeyFor(JwtConstants.JWT_KEY.getBytes(StandardCharsets.UTF_8));
+ return Jwts.builder()
+ .issuer("BP Admin")
+ .subject("Jwt Token")
+ .claim("username", authentication.getName())
+ .claim("details", authentication.getDetails())
+ .issuedAt(new java.util.Date())
+ .expiration(new java.util.Date(System.currentTimeMillis() + JwtConstants.EXPIRATION_TIME))
+ .signWith(key)
+ .compact();
+ }
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginRequest.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginRequest.java
new file mode 100644
index 0000000..3811194
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginRequest.java
@@ -0,0 +1,12 @@
+package com.bpgroup.poc.admin.security.authentication.service;
+
+import lombok.Data;
+
+/**
+ * 로그인 요청 Request
+ */
+@Data
+public class LoginRequest {
+ private String username;
+ private String password;
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginResponse.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginResponse.java
new file mode 100644
index 0000000..ecb7325
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginResponse.java
@@ -0,0 +1,28 @@
+package com.bpgroup.poc.admin.security.authentication.service;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+public class LoginResponse {
+
+ private String resultCode;
+ private String resultMessage;
+ private String token;
+
+ public static LoginResponse success() {
+ LoginResponse response = new LoginResponse();
+ response.resultCode = "0000";
+ response.resultMessage = "Success";
+ return response;
+ }
+
+ public static LoginResponse fail(String resultCode, String resultMessage) {
+ LoginResponse response = new LoginResponse();
+ response.resultCode = resultCode;
+ response.resultMessage = resultMessage;
+ return response;
+ }
+
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginResult.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginResult.java
new file mode 100644
index 0000000..4776041
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginResult.java
@@ -0,0 +1,20 @@
+package com.bpgroup.poc.admin.security.authentication.service;
+
+import lombok.Getter;
+
+@Getter
+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) {
+ LoginResult loginResult = new LoginResult();
+ loginResult.id = id;
+ loginResult.loginId = loginId;
+ loginResult.name = name;
+ loginResult.email = email;
+ return loginResult;
+ }
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginService.java
new file mode 100644
index 0000000..4769cd7
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginService.java
@@ -0,0 +1,41 @@
+package com.bpgroup.poc.admin.security.authentication.service;
+
+import com.bpgroup.poc.admin.domain.admin.entity.Administrator;
+import com.bpgroup.poc.admin.domain.admin.entity.AdministratorRepository;
+import com.bpgroup.poc.admin.security.authentication.service.exception.AdministratorNotFoundException;
+import com.bpgroup.poc.admin.security.authentication.service.exception.DoNotHaveAnyMenuException;
+import com.bpgroup.poc.admin.security.authentication.service.exception.InvalidPasswordException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class LoginService {
+
+ private final AdministratorRepository administratorRepository;
+ private final PasswordEncoder passwordEncoder;
+
+ @Transactional
+ public LoginResult login(String username, String password) throws AdministratorNotFoundException, InvalidPasswordException, DoNotHaveAnyMenuException {
+ Optional administrator = administratorRepository.findByLoginId(username);
+ if (administrator.isEmpty()) {
+ throw new AdministratorNotFoundException(username);
+ }
+
+ if (!passwordEncoder.matches(password, administrator.get().getPassword())) {
+ throw new InvalidPasswordException(username);
+ }
+
+ return LoginResult.of(
+ administrator.get().getId(),
+ administrator.get().getLoginId(),
+ administrator.get().getName(),
+ administrator.get().getLoginId()
+ );
+ }
+
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/AdministratorNotFoundException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/exception/AdministratorNotFoundException.java
similarity index 68%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/AdministratorNotFoundException.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/exception/AdministratorNotFoundException.java
index 2a5a905..df0afa8 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/AdministratorNotFoundException.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/exception/AdministratorNotFoundException.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.app.login.exception;
+package com.bpgroup.poc.admin.security.authentication.service.exception;
public class AdministratorNotFoundException extends Exception {
public AdministratorNotFoundException(String message) {
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/security/authentication/service/exception/DoNotHaveAnyMenuException.java
similarity index 63%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/DoNotHaveAnyMenuException.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/exception/DoNotHaveAnyMenuException.java
index 82690a5..ca1e8a5 100644
--- 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/security/authentication/service/exception/DoNotHaveAnyMenuException.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.app.login.exception;
+package com.bpgroup.poc.admin.security.authentication.service.exception;
public class DoNotHaveAnyMenuException extends Exception {
public DoNotHaveAnyMenuException() {
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/InvalidPasswordException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/exception/InvalidPasswordException.java
similarity index 66%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/InvalidPasswordException.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/exception/InvalidPasswordException.java
index 691e081..ceb917a 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/login/exception/InvalidPasswordException.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/exception/InvalidPasswordException.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.app.login.exception;
+package com.bpgroup.poc.admin.security.authentication.service.exception;
public class InvalidPasswordException extends Exception {
public InvalidPasswordException(String message) {
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtConstants.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtConstants.java
new file mode 100644
index 0000000..0da505a
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtConstants.java
@@ -0,0 +1,10 @@
+package com.bpgroup.poc.admin.security.jwt;
+
+/**
+ * TODO: 사용 시 별도 property 파일로 관리 필요
+ */
+public class JwtConstants {
+ public static final String JWT_KEY = "8530b13adb4e420d9694b27570635b47";
+ public static final String JWT_TOKEN_NAME = "JWT-TOKEN";
+ public static final long EXPIRATION_TIME = 60 * 10 * 1000;
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenValidatorFilter.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenValidatorFilter.java
new file mode 100644
index 0000000..3a8bcc6
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenValidatorFilter.java
@@ -0,0 +1,71 @@
+package com.bpgroup.poc.admin.security.jwt;
+
+import com.bpgroup.poc.admin.security.SecurityFilterConstants;
+import com.bpgroup.poc.admin.security.authentication.AuthenticationDetail;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.crypto.SecretKey;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+@Slf4j
+public class JwtTokenValidatorFilter extends OncePerRequestFilter {
+ @Override
+ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+ String jwt = getJwtFromCookie(request);
+ if (null != jwt) {
+ try {
+ SecretKey key = Keys.hmacShaKeyFor(
+ JwtConstants.JWT_KEY.getBytes(StandardCharsets.UTF_8));
+
+ Claims claims = Jwts.parser()
+ .verifyWith(key)
+ .build()
+ .parseSignedClaims(jwt)
+ .getPayload();
+ String username = claims.get("username", String.class);
+ String details = claims.get("details", String.class);
+ UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(username, null, null);
+ auth.setDetails(AuthenticationDetail.fromJsonString(details));
+ SecurityContextHolder.getContext().setAuthentication(auth);
+ } catch (Exception e) {
+ throw new BadCredentialsException("Invalid Jwt Token");
+ }
+ }
+
+ filterChain.doFilter(request, response);
+ }
+
+ private static String getJwtFromCookie(HttpServletRequest request) {
+ Cookie[] cookies = request.getCookies();
+ if (null != cookies) {
+ for (Cookie cookie : cookies) {
+ if (JwtConstants.JWT_TOKEN_NAME.equals(cookie.getName())) {
+ return cookie.getValue();
+ }
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ protected boolean shouldNotFilter(HttpServletRequest request) {
+ List paths = List.of(SecurityFilterConstants.EXCLUDE_FILTER_STARTS_WITH_URI);
+ return paths.stream().anyMatch(request.getRequestURI()::startsWith);
+ }
+
+}
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
deleted file mode 100644
index f485fd3..0000000
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/values/AdministratorMenu.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.bpgroup.poc.admin.values;
-
-public class AdministratorMenu {
-}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuInfo.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuInfo.java
new file mode 100644
index 0000000..61a7eea
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuInfo.java
@@ -0,0 +1,41 @@
+package com.bpgroup.poc.admin.web.advice.menu;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+public class MenuInfo {
+
+ private String uri;
+ private String name;
+ private Integer sortOrder;
+
+ List menuChildren = new ArrayList<>();
+
+ @Builder
+ public static MenuInfo of(String uri, String name, Integer sortOrder) {
+ MenuInfo menuInfo = new MenuInfo();
+ menuInfo.uri = uri;
+ menuInfo.name = name;
+ menuInfo.sortOrder = sortOrder;
+ return menuInfo;
+ }
+
+ public void addMenuChild(MenuChild menuChild) {
+ menuChildren.add(menuChild);
+ }
+
+ @Getter
+ @ToString
+ @Builder
+ public static class MenuChild {
+ private String uri;
+ private String name;
+ private Integer sortOrder;
+ }
+
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuInfoControllerAdvice.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuInfoControllerAdvice.java
new file mode 100644
index 0000000..4dbe4bd
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuInfoControllerAdvice.java
@@ -0,0 +1,20 @@
+package com.bpgroup.poc.admin.web.advice.menu;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import java.util.List;
+
+@ControllerAdvice(basePackages = "com.bpgroup.poc.admin.web.main")
+@RequiredArgsConstructor
+public class MenuInfoControllerAdvice {
+
+ private final MenuQueryRepository menuQueryRepository;
+
+ @ModelAttribute("menuInfos")
+ public List menuInfo() {
+ return menuQueryRepository.findAllByLoginId();
+ }
+
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuQueryRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuQueryRepository.java
new file mode 100644
index 0000000..bc50a50
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuQueryRepository.java
@@ -0,0 +1,73 @@
+package com.bpgroup.poc.admin.web.advice.menu;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+import java.util.*;
+
+import static com.bpgroup.poc.admin.domain.admin.entity.QAdministrator.administrator;
+import static com.bpgroup.poc.admin.domain.admin.entity.QAdministratorRole.administratorRole;
+import static com.bpgroup.poc.admin.domain.admin.entity.QMenu.menu;
+import static com.bpgroup.poc.admin.domain.admin.entity.QMenuGroup.menuGroup;
+import static com.bpgroup.poc.admin.domain.admin.entity.QRole.role;
+import static com.bpgroup.poc.admin.domain.admin.entity.QRoleMenu.roleMenu;
+
+@Repository
+@RequiredArgsConstructor
+public class MenuQueryRepository {
+
+ private final JPAQueryFactory queryFactory;
+
+ public List findAllByLoginId() {
+ List results = queryFactory.select(
+ menuGroup.uri,
+ menuGroup.name,
+ menuGroup.sortOrder,
+ roleMenu.menu.uri,
+ roleMenu.menu.name,
+ roleMenu.menu.sortOrder
+ )
+ .from(administrator)
+ .innerJoin(administrator.administratorRole, administratorRole)
+ .innerJoin(administratorRole.role, role)
+ .innerJoin(role.roleMenus, roleMenu)
+ .innerJoin(roleMenu.menu, menu)
+ .innerJoin(menu.menuGroup, menuGroup)
+ .where(administrator.loginId.eq("admin"))
+ .orderBy(menuGroup.sortOrder.asc(), roleMenu.menu.sortOrder.asc())
+ .fetch();
+
+ LinkedHashMap menuInfoMap = makeMenuForm(results);
+ return new ArrayList<>(menuInfoMap.values());
+ }
+
+ private static LinkedHashMap makeMenuForm(List results) {
+ LinkedHashMap menuInfoMap = new LinkedHashMap<>();
+
+ for (Tuple tuple : results) {
+ String menuGroupUri = tuple.get(menuGroup.uri);
+ MenuInfo menuInfo = menuInfoMap.get(menuGroupUri);
+
+ if (menuInfo == null) {
+ menuInfo = MenuInfo.builder()
+ .uri(tuple.get(menuGroup.uri))
+ .name(tuple.get(menuGroup.name))
+ .sortOrder(tuple.get(menuGroup.sortOrder))
+ .build();
+ menuInfoMap.put(menuGroupUri, menuInfo);
+ }
+
+ MenuInfo.MenuChild menuChild = MenuInfo.MenuChild.builder()
+ .uri(tuple.get(roleMenu.menu.uri))
+ .name(tuple.get(roleMenu.menu.name))
+ .sortOrder(tuple.get(roleMenu.menu.sortOrder))
+ .build();
+
+ menuInfo.addMenuChild(menuChild);
+ }
+
+ return menuInfoMap;
+ }
+}
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/path/PathInfoControllerAdvice.java
similarity index 95%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/PathInfoControllerAdvice.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/path/PathInfoControllerAdvice.java
index 044d070..e03de50 100644
--- 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/path/PathInfoControllerAdvice.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.web.advice;
+package com.bpgroup.poc.admin.web.advice.path;
import jakarta.servlet.http.HttpServletRequest;
import lombok.Getter;
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
index ca06769..28dfe4e 100644
--- 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
@@ -1,8 +1,9 @@
package com.bpgroup.poc.admin.web.common;
-public class CommonResponse {
+import lombok.Getter;
+@Getter
+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 e7761e5..1a7ca47 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
@@ -1,34 +1,16 @@
package com.bpgroup.poc.admin.web.login;
-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
- public String loginPage(
- @RequestParam(required = false) AuthenticationFailReason error,
- Model model
- ) {
- if (error != null) {
- model.addAttribute("errorMessage", getMessage(error));
- }
-
+ public String loginPage() {
return "login/login";
}
- private String getMessage(AuthenticationFailReason error) {
- return switch (error) {
- case WRONG_LOGIN_ID, WRONG_PASSWORD -> "아이디 또는 비밀번호가 일치하지 않습니다.";
- case HAVE_NO_MENU -> "등록된 메뉴가 없습니다.\n 메뉴 등록 후 이용해주세요.";
- default -> "서버에 오류가 발생했습니다.";
- };
- }
-
}
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
index 3d35078..85c0b29 100644
--- 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
@@ -7,6 +7,7 @@ import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdministratorUpdat
import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
+import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +19,8 @@ import java.util.List;
@RequestMapping("/admin/management")
public class AdministratorManagementRestController {
- private final AdministratorManagementWebService administratorManagementWebService;
+ private final PasswordEncoder passwordEncoder;
+ private final AdministratorManagementService administratorManagementService;
/**
* 전체 조회
@@ -26,7 +28,7 @@ public class AdministratorManagementRestController {
*/
@GetMapping("/list")
public ResponseEntity getAdministrators() {
- List response = administratorManagementWebService.findAll();
+ List response = administratorManagementService.findAll();
return ResponseEntity.ok(response);
}
@@ -37,7 +39,7 @@ public class AdministratorManagementRestController {
*/
@GetMapping("/{loginId}")
public ResponseEntity getAdministrator(@PathVariable @NotBlank String loginId) {
- AdministratorFind.Response response = administratorManagementWebService.find(loginId);
+ AdministratorFind.Response response = administratorManagementService.find(loginId);
return ResponseEntity.ok(response);
}
@@ -52,7 +54,8 @@ public class AdministratorManagementRestController {
@RequestBody @Validated AdministratorCreate.Request request,
BindingResult bindingResult
) {
- AdministratorCreate.Response response = administratorManagementWebService.create(request);
+ request.setPassword(passwordEncoder.encode(request.getPassword()));
+ AdministratorCreate.Response response = administratorManagementService.create(request);
return ResponseEntity.ok(response);
}
@@ -61,8 +64,9 @@ public class AdministratorManagementRestController {
@RequestBody @Validated AdministratorUpdate.Request request,
BindingResult bindingResult
) {
- administratorManagementWebService.update(request);
- return ResponseEntity.ok().build();
+ request.setPassword(passwordEncoder.encode(request.getPassword()));
+ AdministratorUpdate.Response response = administratorManagementService.update(request);
+ return ResponseEntity.ok(response);
}
/**
@@ -76,8 +80,8 @@ public class AdministratorManagementRestController {
@RequestBody @Validated AdministratorDelete.Request request,
BindingResult bindingResult
) {
- administratorManagementWebService.delete(request);
- return ResponseEntity.ok().build();
+ AdministratorDelete.Response response = administratorManagementService.delete(request);
+ return ResponseEntity.ok(response);
}
}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementService.java
new file mode 100644
index 0000000..4cd2c50
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementService.java
@@ -0,0 +1,72 @@
+package com.bpgroup.poc.admin.web.main.admin.management;
+
+import com.bpgroup.poc.admin.domain.admin.command.AdministratorCreateCommand;
+import com.bpgroup.poc.admin.domain.admin.command.AdministratorUpdateCommand;
+import com.bpgroup.poc.admin.domain.admin.entity.Administrator;
+import com.bpgroup.poc.admin.domain.admin.entity.AdministratorRepository;
+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.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class AdministratorManagementService {
+
+ private final AdministratorManagementQueryRepository queryRepository;
+ private final AdministratorRepository repository;
+
+ public List findAll() {
+ return queryRepository.findAll();
+ }
+
+ public AdministratorFind.Response find(@NotBlank String loginId) {
+ return queryRepository.findByLoginId(loginId);
+ }
+
+ public AdministratorCreate.Response create(AdministratorCreate.Request request) {
+ Administrator admin = repository.save(
+ AdministratorCreateCommand.builder()
+ .loginId(request.getLoginId())
+ .password(request.getPassword())
+ .email(request.getEmail())
+ .name(request.getName())
+ .build()
+ .toEntity()
+ );
+
+ return AdministratorCreate.Response.success(admin.getId());
+ }
+
+ public AdministratorUpdate.Response update(AdministratorUpdate.Request request) {
+ Optional findAdministrator = repository.findById(request.getId());
+ if (findAdministrator.isEmpty()) {
+ return AdministratorUpdate.Response.fail("ADMINISTRATOR_NOT_FOUND");
+ }
+
+ Administrator administrator = findAdministrator.get();
+ administrator.update(
+ AdministratorUpdateCommand.of(
+ request.getId(),
+ request.getPassword(),
+ request.getEmail(),
+ request.getName()
+ ).toEntity()
+ );
+
+ return AdministratorUpdate.Response.success();
+ }
+
+ public AdministratorDelete.Response delete(AdministratorDelete.Request request) {
+ repository.deleteById(request.getId());
+ return AdministratorDelete.Response.success();
+ }
+}
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
deleted file mode 100644
index 03c6d50..0000000
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementWebService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-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/AdministratorDelete.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdministratorDelete.java
index 624f988..f9cc185 100644
--- 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
@@ -1,7 +1,11 @@
package com.bpgroup.poc.admin.web.main.admin.management.reqres;
+import com.bpgroup.poc.admin.web.common.CommonResponse;
import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
import lombok.Data;
+import lombok.Getter;
+import lombok.ToString;
public class AdministratorDelete {
@@ -11,4 +15,24 @@ public class AdministratorDelete {
private Long id;
}
+ @Getter
+ @ToString
+ public static class Response extends CommonResponse {
+ @Builder
+ public static AdministratorDelete.Response success() {
+ AdministratorDelete.Response response = new AdministratorDelete.Response();
+ response.resultCode = "0000";
+ response.resultMessage = "Success";
+ return response;
+ }
+
+ @Builder
+ public static AdministratorDelete.Response fail(String resultMessage) {
+ AdministratorDelete.Response response = new AdministratorDelete.Response();
+ response.resultCode = "9999";
+ response.resultMessage = resultMessage;
+ return response;
+ }
+ }
+
}
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
index 1b5495c..14a88a7 100644
--- 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
@@ -1,8 +1,12 @@
package com.bpgroup.poc.admin.web.main.admin.management.reqres;
+import com.bpgroup.poc.admin.web.common.CommonResponse;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
import lombok.Data;
+import lombok.Getter;
+import lombok.ToString;
public class AdministratorUpdate {
@@ -24,4 +28,23 @@ public class AdministratorUpdate {
private String name;
}
+ @Getter
+ @ToString
+ public static class Response extends CommonResponse {
+ @Builder
+ public static AdministratorUpdate.Response success() {
+ AdministratorUpdate.Response response = new AdministratorUpdate.Response();
+ response.resultCode = "0000";
+ response.resultMessage = "Success";
+ return response;
+ }
+
+ @Builder
+ public static AdministratorUpdate.Response fail(String resultMessage) {
+ AdministratorUpdate.Response response = new AdministratorUpdate.Response();
+ response.resultCode = "9999";
+ response.resultMessage = resultMessage;
+ return response;
+ }
+ }
}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleQueryRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleQueryRepository.java
new file mode 100644
index 0000000..6340088
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleQueryRepository.java
@@ -0,0 +1,13 @@
+package com.bpgroup.poc.admin.web.main.admin.role;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class RoleQueryRepository {
+
+ private final JPAQueryFactory queryFactory;
+
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleRestController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleRestController.java
new file mode 100644
index 0000000..3849e68
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleRestController.java
@@ -0,0 +1,60 @@
+package com.bpgroup.poc.admin.web.main.admin.role;
+
+import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleCreate;
+import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleDelete;
+import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleUpdate;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin/role")
+public class RoleRestController {
+
+ private final RoleService roleService;
+
+
+
+ /**
+ * 권한 등록
+ */
+ @PostMapping("/create")
+ public ResponseEntity createRole(
+ @RequestBody @Valid RoleCreate.Request request,
+ BindingResult bindingResult
+ ) {
+ RoleCreate.Response response = roleService.create(request);
+ return ResponseEntity.ok(response);
+ }
+
+ /**
+ * 권한 수정
+ */
+ @PostMapping("/update")
+ public ResponseEntity updateRole(
+ @RequestBody @Valid RoleUpdate.Request request,
+ BindingResult bindingResult
+ ) {
+ RoleUpdate.Response response = roleService.update(request);
+ return ResponseEntity.ok(response);
+ }
+
+ /**
+ * 권한 삭제
+ */
+ @PostMapping("/delete")
+ public ResponseEntity deleteRole(
+ @RequestBody @Valid RoleDelete.Request request,
+ BindingResult bindingResult
+ ) {
+ RoleDelete.Response response = roleService.delete(request);
+ return ResponseEntity.ok(response);
+ }
+
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleService.java
new file mode 100644
index 0000000..9e910bf
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleService.java
@@ -0,0 +1,66 @@
+package com.bpgroup.poc.admin.web.main.admin.role;
+
+import com.bpgroup.poc.admin.domain.admin.entity.Role;
+import com.bpgroup.poc.admin.domain.admin.entity.RoleRepository;
+import com.bpgroup.poc.admin.domain.admin.command.RoleCreateCommand;
+import com.bpgroup.poc.admin.domain.admin.command.RoleUpdateCommand;
+import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleCreate;
+import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleDelete;
+import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleUpdate;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class RoleService {
+
+ private final RoleRepository repository;
+ private final RoleQueryRepository queryRepository;
+
+ /**
+ * ROLE 생성
+ */
+ public RoleCreate.Response create(RoleCreate.Request request) {
+ Role role = repository.save(
+ RoleCreateCommand.builder()
+ .name(request.getName())
+ .description(request.getDescription())
+ .build()
+ .toEntity()
+ );
+
+ return RoleCreate.Response.success(role.getId());
+ }
+
+ /**
+ * ROLE 수정
+ */
+ public RoleUpdate.Response update(RoleUpdate.Request request) {
+ Optional role = repository.findById(request.getId());
+ if (role.isEmpty()) {
+ return RoleUpdate.Response.fail("ROLE_NOT_FOUND");
+ }
+
+ Role findRole = role.get();
+ Role updateRole = RoleUpdateCommand.builder()
+ .name(request.getName())
+ .description(request.getDescription())
+ .build()
+ .toEntity();
+
+ findRole.update(updateRole);
+
+ return RoleUpdate.Response.success();
+ }
+
+ public RoleDelete.Response delete(RoleDelete.Request request) {
+ try {
+ repository.deleteById(request.getId());
+ return RoleDelete.Response.success();
+ } catch (Exception e) {
+ return RoleDelete.Response.fail("Role Delete Fail");
+ }
+ }
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleCreate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleCreate.java
new file mode 100644
index 0000000..9332f34
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleCreate.java
@@ -0,0 +1,42 @@
+package com.bpgroup.poc.admin.web.main.admin.role.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 RoleCreate {
+
+ @Data
+ public static class Request {
+ @NotBlank
+ private String name;
+ private String description;
+ }
+
+ @Getter
+ @ToString
+ public static class Response extends CommonResponse {
+ private Long id;
+
+ @Builder
+ public static RoleCreate.Response success(Long id) {
+ RoleCreate.Response response = new RoleCreate.Response();
+ response.resultCode = "0000";
+ response.resultMessage = "Success";
+ response.id = id;
+ return response;
+ }
+
+ @Builder
+ public static RoleCreate.Response fail() {
+ RoleCreate.Response response = new RoleCreate.Response();
+ response.resultCode = "9999";
+ response.resultMessage = "Fail";
+ return response;
+ }
+
+ }
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleDelete.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleDelete.java
new file mode 100644
index 0000000..bd8be52
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleDelete.java
@@ -0,0 +1,36 @@
+package com.bpgroup.poc.admin.web.main.admin.role.reqres;
+
+import com.bpgroup.poc.admin.web.common.CommonResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import lombok.ToString;
+
+public class RoleDelete {
+ @Data
+ public static class Request {
+ @NotNull
+ private Long id;
+ }
+
+ @Getter
+ @ToString
+ public static class Response extends CommonResponse {
+ @Builder
+ public static RoleDelete.Response success() {
+ RoleDelete.Response response = new RoleDelete.Response();
+ response.resultCode = "0000";
+ response.resultMessage = "Success";
+ return response;
+ }
+
+ @Builder
+ public static RoleDelete.Response fail(String resultMessage) {
+ RoleDelete.Response response = new RoleDelete.Response();
+ response.resultCode = "9999";
+ response.resultMessage = resultMessage;
+ return response;
+ }
+ }
+}
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleUpdate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleUpdate.java
new file mode 100644
index 0000000..a5af759
--- /dev/null
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleUpdate.java
@@ -0,0 +1,41 @@
+package com.bpgroup.poc.admin.web.main.admin.role.reqres;
+
+import com.bpgroup.poc.admin.web.common.CommonResponse;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import lombok.ToString;
+
+public class RoleUpdate {
+
+ @Data
+ public static class Request {
+ @NotNull
+ private Long id;
+ @NotBlank
+ private String name;
+ private String description;
+ }
+
+ @Getter
+ @ToString
+ public static class Response extends CommonResponse {
+ @Builder
+ public static RoleUpdate.Response success() {
+ RoleUpdate.Response response = new RoleUpdate.Response();
+ response.resultCode = "0000";
+ response.resultMessage = "Success";
+ return response;
+ }
+
+ @Builder
+ public static RoleUpdate.Response fail(String resultMessage) {
+ RoleUpdate.Response response = new RoleUpdate.Response();
+ response.resultCode = "9999";
+ response.resultMessage = resultMessage;
+ return response;
+ }
+ }
+}
diff --git a/poc/admin/src/main/resources/static/css/fonts.css b/poc/admin/src/main/resources/static/css/fonts.css
new file mode 100644
index 0000000..1cc0dda
--- /dev/null
+++ b/poc/admin/src/main/resources/static/css/fonts.css
@@ -0,0 +1,63 @@
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 900;
+ font-display: swap;
+ src: local('Pretendard Black'), url(../font/Pretendard-Black.woff2) format('woff2'), url(../font/Pretendard-Black.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 800;
+ font-display: swap;
+ src: local('Pretendard ExtraBold'), url(../font/Pretendard-ExtraBold.woff2) format('woff2'), url(../font/Pretendard-ExtraBold.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 700;
+ font-display: swap;
+ src: local('Pretendard Bold'), url(../font/Pretendard-Bold.woff2) format('woff2'), url(../font/Pretendard-Bold.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 600;
+ font-display: swap;
+ src: local('Pretendard SemiBold'), url(../font/Pretendard-SemiBold.woff2) format('woff2'), url(../font/Pretendard-SemiBold.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 500;
+ font-display: swap;
+ src: local('Pretendard Medium'), url(../font/Pretendard-Medium.woff2) format('woff2'), url(../font/Pretendard-Medium.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 400;
+ font-display: swap;
+ src: local('Pretendard Regular'), url(../font/Pretendard-Regular.woff2) format('woff2'), url(../font/Pretendard-Regular.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 300;
+ font-display: swap;
+ src: local('Pretendard Light'), url(../font/Pretendard-Light.woff2) format('woff2'), url(../font/Pretendard-Light.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 200;
+ font-display: swap;
+ src: local('Pretendard ExtraLight'), url(../font/Pretendard-ExtraLight.woff2) format('woff2'), url(../font/Pretendard-ExtraLight.woff) format('woff');
+}
+
+@font-face {
+ font-family: 'Pretendard';
+ font-weight: 100;
+ font-display: swap;
+ src: local('Pretendard Thin'), url(../font/Pretendard-Thin.woff2) format('woff2'), url(../font/Pretendard-Thin.woff) format('woff');
+}
diff --git a/poc/admin/src/main/resources/static/css/reset.css b/poc/admin/src/main/resources/static/css/reset.css
index e40173e..c93a2c7 100644
--- a/poc/admin/src/main/resources/static/css/reset.css
+++ b/poc/admin/src/main/resources/static/css/reset.css
@@ -3,7 +3,7 @@
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre, a,
-abbr, address, big, cite, code, del,
+abbr, acsronym, address, big, cite, code, del,
dfn, em, img, ins, kbd, q, s, samp, small,
strike, strong, sub, sup, tt, var, b, u, i,
center, dl, dt, dd, ol, ul, li, fieldset, form,
@@ -15,12 +15,13 @@ summary, time, mark, audio, video, button, a, input {
margin: 0;
padding: 0;
border: 0;
+ box-sizing: border-box;
font-size: 100%;
font: inherit;
vertical-align: baseline;
-webkit-tap-highlight-color : rgba(0,0,0,0);
line-height: 150%;
- box-sizing: border-box;
+ word-break: keep-all;
}
/* HTML5 display-role reset for older browsers */
@@ -33,7 +34,7 @@ body {
line-height: 1
}
ol, ul {
- list-style: none
+ list-style: none;
}
blockquote, q {
quotes: none
@@ -50,7 +51,3 @@ table {
a {
text-decoration: none
}
-* {
- font-family: 'Pretendard', 'sans-serif';
- box-sizing: border-box;
- }
\ No newline at end of file
diff --git a/poc/admin/src/main/resources/static/css/style.css b/poc/admin/src/main/resources/static/css/style.css
index db78d88..3a4236d 100644
--- a/poc/admin/src/main/resources/static/css/style.css
+++ b/poc/admin/src/main/resources/static/css/style.css
@@ -1,61 +1,89 @@
@charset "utf-8";
-@import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css');
@import 'reset.css';
+@import 'fonts.css';
+
:root {
/* color */
--color-black: #000000;
--color-white: #ffffff;
+ --color-blue: #0059C5;
+ --color-333: #333;
+ --color-666: #666;
+ --color-999: #999;
+ --color-b6b6b6: #b6b6b6;
+ --color-c6c6c6: #c6c6c6;
+ --color-d6d6d6: #d6d6d6;
+ --color-e6e6e6: #e6e6e6;
+ --color-f5f5f5: #f5f5f5;
+ --color-f9f9f9: #f9f9f9;
+ --color-red: #ff0000;
- /* font */
- --fs-30 : 1.875rem;
- --fs-29 : 1.813rem;
- --fs-28 : 1.75rem;
- --fs-27 : 1.688rem;
- --fs-26 : 1.625rem;
- --fs-25 : 1.563rem;
- --fs-24 : 1.5rem;
- --fs-23 : 1.438rem;
- --fs-22 : 1.375rem;
- --fs-21 : 1.3125rem;
- --fs-20 : 1.25rem;
- --fs-19 : 1.1875rem;
- --fs-18 : 1.125rem;
- --fs-17 : 1.0625rem;
- --fs-16 : 1rem;
- --fs-15 : 0.9375rem;
- --fs-14 : 0.875rem;
- --fs-13 : 0.8125rem;
- --fs-12 : 0.75rem;
- --fs-11 : 0.6875rem;
- --fs-10 : 0.625rem;
+ /* font Size */
+ --fs-48: 3rem;
+ --fs-40: 2.5rem;
+ --fs-36: 2.25rem;
+ --fs-34: 2.125rem;
+ --fs-30: 1.875rem;
+ --fs-29: 1.813rem;
+ --fs-28: 1.75rem;
+ --fs-27: 1.688rem;
+ --fs-26: 1.625rem;
+ --fs-25: 1.563rem;
+ --fs-24: 1.5rem;
+ --fs-23: 1.438rem;
+ --fs-22: 1.375rem;
+ --fs-21: 1.3125rem;
+ --fs-20: 1.25rem;
+ --fs-19: 1.1875rem;
+ --fs-18: 1.125rem;
+ --fs-17: 1.0625rem;
+ --fs-16: 1rem;
+ --fs-15: 0.9375rem;
+ --fs-14: 0.875rem;
+ --fs-13: 0.8125rem;
+ --fs-12: 0.75rem;
+ --fs-11: 0.6875rem;
- --fw-800 : 800;
- --fw-700 : 700;
- --fw-600 : 600;
- --fw-500 : 500;
- --fw-400 : 400;
- --fw-300 : 300;
- --fw-200 : 200;
- --fw-100 : 100;
+ /* font Weight */
+ --fw-300: 300;
+ --fw-400: 400;
+ --fw-500: 500;
+ --fw-600: 600;
+ --fw-700: 700;
}
/* 공통 */
.blind {
- visibility: hidden;
- overflow: hidden;
- position: absolute;
- top: 0;
- left: 0;
- width: 0;
- height: 0;
- font-size: 0;
+ visibility: hidden;
+ overflow: hidden;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 0;
+ height: 0;
+ font-size: 0;
line-height: 0
}
-.wid400 {
- width: 400px;
+
+
+/* link */
+
+a:-webkit-any-link {
+ color: -webkit-link;
+ cursor: pointer;
+ text-decoration: underline;
+}
+a:link, a:visited {
+ color: var(--color-black);
+}
+a:hover {
+ color: var(--color-blue);
+}
+a:active {
+ opacity: .75;
}
@@ -63,138 +91,63 @@
button {
cursor: pointer;
+ background-color: var(--color-white);
border-radius: 3px;
}
-a:active, button:active {
+button:active {
opacity: .75;
}
button:disabled {
- color: #999;
- opacity: 0.5;
+ opacity: 0.3;
}
-.btn_normal {
- font-size: var(--fs-14);
- color: #333;
- height: 36px;
- padding: 0 10px;
- border: 1px solid #999;
- background-color: #fff;
-}
-.btn_confirm {
- font-size: var(--fs-14);
- color: #fff;
- height: 36px;
- padding: 0 10px;
- border: 1px solid #a6a6a6;
- background-color: var(--color-black);
-}
-.closeButton {
- display: none;
- position: absolute;
- top: 15px;
- right: 15px;
- background: transparent;
-}
-
-/* layout */
-
-html, body {
- height: 100vh;
- min-height: -webkit-fill-available;
- min-height: var(--vh-100);
- font-size: 16px;
- color: #333;
- line-height: 150%;
- font-family: 'Pretendard', 'sans-serif';
-}
-header {
- /*position: fixed;
- left: 0;
- top: 0;*/
+.btn_blue, .btn_white {
width: 100%;
- padding: 16px 20px;
- border-bottom: 1px solid #c6c6c6;
- overflow: hidden;
- background-color: #ffffff;
- z-index: 100;
-}
-header a.nav_menu {
- display: none;
-}
-.wrapper {
- margin: 0 auto;
- height: 100vh;
-}
-.container {
- padding: 10px 30px 30px 30px;
- margin: 0 auto;
- min-width: 320px;
- overflow-y: auto;
-}
-.container h2 {
- font-size: var(--fs-30);
- font-weight: var(--fw-800);
- margin: 15px 0 10px 0;
-}
-.breadcrumb a {
- font-size: 15px;
- color: #999;
-}
-.breadcrumb a::after {
- position: relative;
- content: ">";
- padding-left: 10px;
- padding-right: 5px;
- font-size: 10px;
- top: -2px
-}
-.breadcrumb a:last-child {
- color: #333;
-}
-.breadcrumb a:last-child::after {
- content: " ";
-}
-.option_wrap {
- position: relative;
- padding: 15px 12px;
- border: 1px solid #d6d6d6;
- border-radius: 6px;
-}
-.option_wrap ul {
- overflow: hidden;
-}
-.option_wrap ul li {
- display: inline-block;
- padding: 5px 10px;
-}
-.option_wrap ul li span {
- display: inline-block;
- padding: 3px 0;
-}
-.position_right {
- position: absolute;
- right: 12px;
- bottom: 12px;
-}
-
-
-
-/* header */
-header h1 {
- float: left;
- font-size: var(--fs-26);
- font-weight: var(--fw-800)
-}
-.menu_right {
- float: right;
font-size: var(--fs-14);
- font-weight: var(--fw-400);
- color: #666;
- margin-top: 10px;
+ font-weight: var(--fw-600);
+ border-radius: 3px;
}
-.menu_right a {
- display: inline-block;
- padding: 0 10px;
+.btn_blue {
+ color: var(--color-white);
+ background-color: var(--color-blue);
+ border: 1px solid var(--color-blue);
+}
+.btn_white {
+ color: var(--color-black);
+ background-color: var(--color-white);
+ border: 1px solid var(--color-c6c6c6);
+}
+.tb_button {
+ position: relative;
+}
+.tb_button button {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ padding: 3px 10px;
+ font-size: var(--fs-13);
+ color: var(--color-333);
+ border: 1px solid var(--color-c6c6c6);
+}
+.posi_right {
+ max-width: 110px;
+ float: right;
+ position: relative;
+ top: 35px;
+ font-size: var(--fs-14);
+ padding: 7px 10px;
+}
+.ico_save {
+ padding-top: 20px;
+}
+
+
+/* heading */
+
+h2 {
+ position: relative;
+ font-size: var(--fs-18);
+ font-weight: var(--fw-500);
}
@@ -204,26 +157,24 @@ header h1 {
outline: none;
}
input {
- -webkit-appearance : none;
+ -webkit-appearance: none;
-moz-appearance:none;
appearance:none;
- height: 36px;
- border: 1px solid #c6c6c6;
- padding: 0 10px;
+ height: 46px;
+ border-bottom: 1px solid var(--color-d6d6d6);
+ padding: 0;
box-sizing: border-box;
outline: none;
- font-size: var(--fs-15);
- color: #333;
- border-radius: 3px;
+ font-size: var(--fs-16);
+ transition: all .05s;
}
input:focus, input:active, input:hover {
- border: 1px solid #333;
outline: none;
}
input[type=number] {
-moz-appearance: textfield;
}
-input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
appearance: none;
@@ -245,24 +196,134 @@ input:invalid {
box-shadow: none;
}
input:focus-within {
- border: 1px solid #333;
+ border-bottom: 2px solid var(--color-blue);
}
input:disabled {
- background: #f5f5f5;
+ color: var(--color-999);
+ background: var(--color-white);
}
input:read-only {
- color: var(--color-black);
- background: #f5f5f5;
+ color: var(--color-666);
+ background: var(--color-white);
+}
+input:disabled:focus, input:disabled:active, input:disabled:hover {
+ background: #fff !important;
+ box-shadow: inset 0 -2px 0 var(--color-d6d6d6);
}
input::placeholder {
- color: #c6c6c6;
- font-weight: var(--fw-400);
+ color: var(--color-c6c6c6);
}
*::placeholder {
font-weight: var(--fw-300);
}
-.date_select input {
+input[type="password"] {
+ letter-spacing: 1px;
+}
+input.id[type="text"] {
+ font-size: var(--fs-18);
+ font-weight: var(--fw-700);
+}
+input.big[type="password"] {
+ letter-spacing: -5px;
+ font-size: var(--fs-30)
+}
+input.sm {
+ width: 100%;
+ box-shadow: inset 0 -1px 0 var(--color-d6d6d6);
+ transition: all 0.1s ease;
font-size: var(--fs-15);
+ overflow: hidden;
+ border: 0;
+}
+input.sm:focus, input.sm:active, input.sm:hover {
+ box-shadow: inset 0 -2px 0 var(--color-blue);
+}
+input.sm:disabled:focus, input.sm:disabled:active, input.sm:disabled:hover {
+ background: var(--color-white) !important;
+ box-shadow: inset 0 -1px 0 var(--color-d6d6d6);
+}
+.inp {
+ position: relative;
+}
+.err_msg {
+ display: none;
+}
+.err .err_msg {
+ display: block;
+ color: var(--color-red);
+ font-size: var(--fs-14);
+ margin-top: 10px;
+}
+.btn_clear {
+ position: absolute;
+ top: 50%;
+ right: 0;
+ width: 30px;
+ height: 30px;
+ transform: translateY(-50%);
+ background: url('../images/ico_clear.svg') no-repeat center;
+ background-size: 16px auto;
+ opacity: .5;
+}
+
+
+/* select */
+
+select {
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+ padding: 6px 30px 6px 10px;
+ border: 1px solid var(--color-c6c6c6);
+ border-radius: 3px;
+ background: url('../images/select_arrow.svg') no-repeat right 10px center;
+ outline: none;
+ transition: all .05s;
+}
+select:hover {
+ border-color: var(--color-black);
+ outline: none;
+}
+select:focus {
+ border-color: var(--color-black);
+ color: var(--color-black);
+ outline: none;
+}
+select:disabled {
+ opacity: 0.5;
+}
+
+
+/* flex */
+
+.flexbox {
+ position: relative;
+ display: -webkit-box;
+ display: -moz-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-align: center;
+ -moz-box-align: center;
+ -ms-flex-align: center;
+ align-items: center;
+ flex-direction: row;
+}
+.flexitem {
+ -webkit-box-flex: 1;
+ -moz-box-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ margin: 0;
+ padding: 0;
+ align-items: center;
+ -webkit-box-align: center;
+ -moz-box-align: center;
+ -ms-flex-align: center;
+ -webkit-box-orient: horizontal;
+ -webkit-box-direction: normal;
+ -moz-box-orient: horizontal;
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap;
}
@@ -271,23 +332,33 @@ input::placeholder {
.check_box {
position: relative;
display: inline-block;
+ padding-left: 30px;
+ padding-right: 30px;
font-size: var(--fs-15);
+ font-weight: var(--fw-400);
}
.check_box label {
+ position: absolute;
+ left: 3px;
+ top: 0;
cursor: pointer;
+ transition: all .05s;
}
-input[type="checkbox"] + label {
- position: relative;
- top: 5px;
- display: block;
- width: 16px;
- height: 16px;
- background: url(../images/chk_off.svg) no-repeat 0 0 / contain;
+.check_box input[type="checkbox"] + label {
+ position: absolute;
+ display: inline-block;
+ width: 20px;
+ height: 20px;
+ padding-left: 30px;
+ cursor: pointer;
+ background: url('../images/chk_off.svg') no-repeat 0 0 / contain;
+ background-size: 20px auto;
}
-input[type='checkbox']:checked + label {
- background: url(../images/chk_on.svg) no-repeat 0 0 / contain;
+.check_box input[type='checkbox']:checked + label {
+ background: url('../images/chk_on.svg') no-repeat 0 0 / contain;
+ background-size: 20px auto;
}
-input[type="checkbox"] {
+.check_box input[type="checkbox"] {
display: none;
}
@@ -299,504 +370,530 @@ input[type="checkbox"] {
padding-left: 33px;
padding-right: 30px;
font-size: var(--fs-16);
- margin-left: 12px;
}
.radio_box label {
position: absolute;
- left: 3px;
- top: 2px;
+ left: 0;
+ top: 0;
cursor: pointer;
}
input[type="radio"] + label {
position: absolute;
display: block;
- height: 20px;
+ height: 24px;
padding-left: 26px;
- background: url(../images/radio_off.svg) no-repeat 0 0 / contain;
+ background: url('../images/radio_off.svg') no-repeat 0 0;
+ background-size: 18px auto;
+ background-position: 0 50%;
}
input[type='radio']:checked + label {
- background: url(../images/radio_on.svg) no-repeat 0 0 / contain;
+ background: url('../images/radio_on.svg') no-repeat 0 0;
+ background-size: 18px auto;
+ background-position: 0 50%;
}
input[type="radio"] {
display: none;
}
-/* select */
+/* list */
-select {
- -webkit-appearance: none;
- -moz-appearance:none;
- appearance:none;
- height: 36px;
- padding: 0 25px 0 10px;
- border: 0;
- color: #333;
- font-size: var(--fs-14);
- font-weight: var(--fw-400);
- border-radius: 3px;
- -moz-border-radius: 3px;
- outline: 0;
- background: url('../images/ico_down_black.svg') no-repeat center right 8px, var(--color-white);
- background-size: 10px auto;
- transition: all .2s;
- border: 1px solid #c6c6c6;
- font-family: 'Pretendard', 'sans-serif';
+ul {
+ overflow: hidden;
}
-select:disabled {
- opacity: 0.6;
-}
-select::-ms-expand {
- display:none;
-}
-select:focus-within, select:active {
- border: 1px solid #333;
-}
-select:disabled {
- background-color: #f9f9f9;
-}
-select:disabled + span {
- opacity: 0.3;
-}
-
-
-/* flex layout */
-
-.flexbox {
+ul li {
position: relative;
- display: -webkit-box;
- display: -moz-box;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-align: center;
- -moz-box-align: center;
- -ms-flex-align: center;
- flex-direction: row;
- align-items: stretch
}
-.flexitem {
- flex: 1;
- -webkit-box-flex: 1;
- -moz-box-flex: 1;
- -ms-flex: 1;
- -webkit-box-orient: horizontal;
- -webkit-box-direction: normal;
- -moz-box-orient: horizontal;
- -ms-flex-wrap: wrap;
- flex-wrap: wrap;
+ul li em {
+ position: absolute;
+ left: 0;
}
-/* navigation */
+/* layout */
-.menu_wrap {
- width: 100%;
- max-width: 250px;
- min-width: 200px;
+* {
+ word-break: keep-all;
+ box-sizing: border-box;
+}
+html, body {
height: 100%;
- overflow: auto;
- background-color: #333;
- padding: 20px 0;
+ min-height: -webkit-fill-available;
+ min-height: var(--vh-100);
+ font-size: 16px;
+ color: #1c1c1c;
+ line-height: 150%;
+ font-family: 'Pretendard', 'sans-serif';
+ background-color: var(--color-white);
+ -webkit-text-size-adjust: 100%;
+ -webkit-font-smoothing: antialiased;
+ /* scrollbar-gutter: stable; */
}
-.menu_wrap h2 {
- display: block;
- font-size: var(--fs-20);
- font-weight: var(--fw-800);
- color: #fff;
- padding: 0 20px;
- margin-bottom: 10px;
+input, button, select {
+ font-family: inherit;
}
-.menu_wrap_mobile {
- display: none;
+header, main, footer {
+ min-width: 768px;
}
-.menu_wrap_mobile h2 {
- display: block;
- font-size: var(--fs-20);
- font-weight: var(--fw-800);
- color: #fff;
- padding: 0 20px;
- margin-bottom: 10px;
+main {
+ width: 100%;
}
-.nav_tit {
+.login main {
+ width: 100%;
+ min-height: calc(100% - 103px);
+}
+
+
+/* header */
+
+header {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ padding: 5px;
+ background-color: var(--color-white);
+ border-bottom: 1px solid var(--color-e6e6e6);
+ box-shadow: 0 2px 12px rgb(0, 0, 0, 0.03);
+ z-index: 1000;
+}
+header > div {
position: relative;
- display: block;
- cursor: pointer;
- font-size: var(--fs-15);
- color: #fff;
- background: url('../images/ico_down.svg') no-repeat right 20px center;
- background-size: 10px;
- transition: background 0.1s ease;
- padding: 8px 20px;
}
-.nav_tit.active {
- background: url('../images/ico_up.svg') no-repeat right 20px center, #222;
- background-size: 10px;
+header > div h1 {
+ float: left;
+ font-size: var(--fs-20);
+ line-height: 50px;
+ padding-left: 10px;
+ font-weight: var(--fw-700);
}
-.nav_tit.active + .nav_section {
- display: block;
-}
-.nav_section {
- display: none;
- list-style: none;
- padding: 10px 20px;
-}
-.nav_section li {
- padding: 2px 10px;
-}
-.nav_section li a {
- display: block;
- color: #fff;
+header > div h1 span {
+ position: relative;
+ top: -2px;
+ left: 10px;
+ color: var(--color-666);
+ font-weight: var(--fw-400);
font-size: var(--fs-14);
}
+header > div .language {
+ position: relative;
+ top: 10px;
+ right: 10px;
+ float: right;
+ font-size: var(--fs-14);
+ color: var(--color-333);
+}
+header > div .language span {
+ display: inline-block;
+ margin-left: 10px;
+}
+header > div::after {
+ content: " ";
+ clear: both;
+}
+header > div .user_info {
+ position: relative;
+ top: 12px;
+ right: 10px;
+ float: right;
+}
+header > div .user_info a {
+ font-size: var(--fs-14);
+ color: var(--color-333);
+}
+header > div .user_info a:last-child {
+ margin-left: 10px;
+}
+
+
+/* sidebar*/
+
+.container {
+ display: flex;
+ flex-direction: row;
+ min-height: calc(100vh - 61px)
+}
+.sidebar {
+ width: 200px;
+ background-color: #333;
+ color: #fff;
+ transition: width 0.3s ease;
+ overflow: hidden;
+}
+.toggle-btn {
+ position: absolute;
+ top: 69px;
+ left: 10px;
+ width: 30px;
+ height: 30px;
+ padding: 10px;
+ background: url('../images/ico_max.svg') no-repeat center;
+ color: #fff;
+ border: none;
+ cursor: pointer;
+ border-radius: 3px;
+}
+.toggle-btn.active {
+ background: url('../images/ico_mini.svg') no-repeat center;
+ left: 5px;
+}
+.accordion {
+ list-style-type: none;
+}
+.accordion-content {
+ padding: 10px;
+ display: none;
+}
+.sidebar .accordion {
+ max-width: 300px;
+ color: var(--color-white);
+ margin-top: 50px;
+ height: calc(100% - 200px);
+}
+.sidebar .accordion-header {
+ padding: 10px;
+ cursor: pointer;
+ white-space: nowrap;
+ font-size: var(--fs-15);
+ color: var(--color-e6e6e6);
+}
+.sidebar .accordion-header::after {
+ content: '┼';
+ float: right;
+ font-size: 7px;
+}
+.sidebar .accordion-item .accordion-header.active::after {
+ content: '━';
+ font-size: 7px;
+}
+.accordion-item .accordion-header.active + .accordion-content {
+ display: block;
+}
+.sidebar .sub_menu a {
+ display: block;
+ font-size: var(--fs-14);
+ text-decoration: none;
+ color: var(--color-e6e6e6);
+ padding: 5px;
+}
+
+
+/* bread crum */
+
+.con_header {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ min-height: 40px;
+ font-size: var(--fs-14);
+ color: #999;
+ padding-left: 48px;
+}
+.con_header.active {
+ padding-left: 30px;
+}
+.con_header::before {
+ content: "";
+ position: absolute;
+ top: 11px;
+ display: inline-block;
+ width: 1px;
+ height: 24px;
+ background-color: var(--color-c6c6c6);
+}
+.con_header.active::before {
+ content: none;
+}
+.con_header.active .breadcrum {
+ padding-left: 0;
+}
+.con_header .breadcrum {
+ position: relative;
+ top: 2px;
+ overflow: hidden;
+ display: inline-block;
+ padding-left: 20px;
+}
+.con_header .breadcrum a {
+ display: inline-block;
+ height: 40px;
+ line-height: 40px;
+ text-decoration: none;
+ color: var(--color-999);
+}
+.con_header .breadcrum a::after {
+ content: ">";
+ display: inline-block;
+ margin: 0 4px 0 6px;
+ font-size: var(--fs-12);
+ color: #c6c6c6;
+}
+.con_header .breadcrum a:last-child:after {
+ content: none;
+}
+.con_header .breadcrum a:last-child {
+ color: var(--color-333);
+}
+
+
+/* footer */
+
+.login footer {
+ position: relative;
+}
+.login footer > div {
+ padding: 20px;
+}
+.login .foot_head {
+ overflow: hidden;
+ height: 30px;
+}
+.login .foot_head h2 {
+ position: relative;
+ top: -17px;
+ float: right;
+ margin-left: 20px;
+}
+.login .foot_head h2 img {
+ height: 11px;
+}
+.login .foot_head a {
+ float: right;
+ font-size: var(--fs-13);
+ color: var(--color-333);
+}
+.login .foot_copy {
+ font-size: var(--fs-11);
+ color: var(--color-666);
+ text-align: right;
+ width: 100%;
+ padding: 0;
+}
+footer {
+ min-width: 200px;
+}
+.foot_head h2 {
+ padding-left: 10px;
+}
+.foot_head h2 img {
+ width: 60px;
+}
+.foot_head a {
+ color: var(--color-c6c6c6);
+ font-size: var(--fs-12);
+ padding-left: 10px;
+ text-decoration: none;
+}
+.foot_copy {
+ font-size: var(--fs-11);
+ word-break: break-all;
+ width: 200px;
+ padding: 0 10px 10px 10px;
+ color: var(--color-999);
+}
+
+/* Heading */
+
+h2 {
+ font-size: var(--fs-30);
+ font-weight: var(--fw-700);
+}
+h3 {
+ font-size: var(--fs-20);
+ font-weight: var(--fw-700);
+}
+
+
+/* scroll */
+
+.scrollable::-webkit-scrollbar {
+ width: 5px;
+}
+.scrollable::-webkit-scrollbar-track {
+ background-color: #fff;
+}
+.scrollable::-webkit-scrollbar-thumb {
+ background-color: #c6c6c6;
+ border-radius: 8px;
+}
+.scrollable::-webkit-scrollbar-thumb:hover {
+ background-color: #999;
+}
+
+
+/* pagination */
+
+.pagination {
+ display: inline-block;
+ margin-top: 30px;
+}
+.pagination a {
+ color: black;
+ float: left;
+ font-size: var(--fs-13);
+ padding: 8px 14px;
+ text-decoration: none;
+ border-radius: 3px;
+ border: 1px solid var(--color-c6c6c6);
+ margin: 0 5px;
+}
+.pagination a.active {
+ background-color: var(--color-blue);
+ color: var(--color-white);
+ border-radius: 5px;
+}
+.pagination a:hover:not(.active) {
+ background-color: #ddd;
+ border-radius: 5px;
+}
/* table */
-.table_wrap {
- position: relative;
-}
-.table_wrap.mt-20 {
- margin-top: 20px;
-}
-.table_wrap h4 {
- display: inline-block;
- font-size: 22px;
- font-weight: var(--fw-800);
- height: 36px;
- line-height: 36px;
- margin-bottom: 10px;
-}
-.tb_right {
- position: absolute;
- right: 0;
- top: 0;
-}
+
table {
width: 100%;
- border-top: 1px solid #333; table-layout:fixed;
+ text-align: left;
+ border-collapse: collapse;
}
-table caption{font-size:0; text-indent:-9999px;}
-th, td {
- text-align: center;
- padding: 12px 8px;
- color: #333;
-}
-th {
+table th {
+ background-color: var(--color-f5f5f5);
font-size: var(--fs-14);
+ font-weight: var(--fw-600);
+ padding: 8px 10px;
+ position: sticky;
+ top: 0;
+}
+table td {
+ border-top: 1px solid var(--color-d6d6d6);
+ font-size: var(--fs-14);
+ color: var(--color-333);
+ padding: 10px;
+}
+.tb_one {
+ width: 100%;
+ overflow: hidden;
+ text-align: center;
+ margin-top: 15px;
+}
+.tb_two {
+ display: flex;
+ width: 100%;
+}
+.tb_two .flex1 {
+ flex: 1;
+}
+.tb_one.sty_box {
+ position: relative;
+ border: 1px solid var(--color-d6d6d6);
+}
+.tb_sty01 th, .tb_sty01 td {
+ text-align: center;
+}
+table.num_txt td:first-child {
+ font-size: var(--fs-13);
+}
+.scrollable-container {
+ max-height: 300px;
+ overflow-y: auto;
+}
+
+
+/* 로그인 */
+
+body.login {
+ background-color: var(--color-white);
+}
+body.login select {
+ background-size: 8px auto;
+}
+.login_wrapper {
+ width: 100%;
+ max-width: 400px;
+ margin: 0 auto;
+ padding-top: 10vh;
+}
+.login_wrapper h2 {
+ font-size: var(--fs-36);
font-weight: var(--fw-700);
- background-color: #f9f9f9;
- border-bottom: 1px solid #c6c6c6
}
-td {
- font-size: var(--fs-15);
- font-weight: var(--fw-400);
- border-bottom: 1px solid #e6e6e6;
+.login_wrapper .check_form {
+ text-align: right;
+ margin-top: 30px;
}
-
-
-
-/* modal */
-
-.modal {
- display: none;
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.7);
- z-index: 1000;
+.login_wrapper .login_box .check_box {
+ font-size: var(--fs-14);
+ color: var(--color-333);
+ padding-left: 25px;
+ padding-right: 0;
}
-.modal-content {
- position: absolute;
- top: 50%;
- left: 50%;
- display: inline-block;
- width: 100%;
- max-width: 320px;
- transform: translate(-50%, -50%);
- background-color: white;
- padding: 16px;
+.login_wrapper .login_box .check_box input[type="checkbox"] + label {
+ background-size: 16px auto;
+ background-position: left 0 top 40%;
}
-.modal-header {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- border-bottom: 1px solid #d6d6d6;
-}
-.modal-header h2 {
- height: 50px;
- line-height: 50px;
- font-size: 20px;
- margin: 0;
- padding: 0 15px;
-
-}
-.close {
- position: absolute;
- top: 10px;
- right: 10px;
- font-size: 20px;
- cursor: pointer;
-}
-.modal-body {
- margin-top: 50px;
- font-size: var(--fs-15);
+.login_wrapper .login_box .input_form {
padding: 10px 0;
}
-.modal-body .col-box {
- padding-bottom: 16px;
+.login_wrapper .login_box .input_form p {
+ padding: 10px 0;
}
-p.col-box label {
- display: block;
- margin-bottom: 5px;
-}
-p.col-box input {
+.login_wrapper .login_box .input_form input {
width: 100%;
-}
-.btn_both {
- display: flex;
-}
-.btn_both button {
- width: 50%;
- flex: 1;
-}
-.btn_both button:nth-child(1) {
- margin-right: 3px;
-}
-.btn_both button:nth-child(2) {
- margin-left: 3px;
-}
-
-
-/* login */
-
-.login_wrap {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.7);
- z-index: 1;
-}
-.login_box {
- position: absolute;
- top: 50%;
- left: 50%;
- display: inline-block;
- width: 100%;
- max-width: 420px;
- transform: translate(-50%, -50%);
- background-color: white;
- padding: 30px;
- border-radius: 6px;
-}
-.login_box h1 {
- font-size: var(--fs-26);
- font-weight: var(--fw-800);
- margin-top: 5px;
- margin-bottom: 20px;
-}
-.login_box p {
- padding: 6px 0;
-}
-input.login_in {
- width: 40% !important;
- margin-right: 5px;
-}
-.login_box label {
- display: inline-block;
- min-width: 75px;
- text-align: right;
- padding-right: 10px;
-}
-.login_box input {
- width: 76%;
-}
-.btn_login {
- width: 100% !important;
- margin-top: 30px;
- height: 44px;
- font-size: var(--fs-15);
- font-weight: var(--fw-800);
-}
-.login_subtit {
- position: relative;
- top: -20px;
- color: #999;
-}
-
-
-/* main */
-
-.graph {
- margin-top: 15px;
- padding: 25px;
- background-color: #f9f9f9;
-}
-.graph canvas {
- max-height: 200px;
-}
-.main_count {
- padding: 30px 0;
-}
-.count_wrap {
- overflow: hidden;
- width: 100%;
- display: flex;
-}
-.count_wrap > li {
- flex: 1;
- font-size: var(--fs-16);
- padding: 25px;
- border: 1px solid #d6d6d6;
- border-radius: 6px;
- margin-right: 30px;
-}
-.count_wrap > li:last-child {
- margin-right: 0;
-}
-.count_wrap > li strong {
- font-weight: var(--fw-700);
- font-size: var(--fs-15);
-}
-.count_wrap > li p {
- position: relative;
- padding-left: 10px;
- margin-bottom: 5px;
-}
-.count_wrap > li p em {
- position: absolute;
- left: 0;
- top: 0;
-}
-.count_wrap h5 {
font-size: var(--fs-18);
- font-weight: var(--fw-800);
- margin-bottom: 15px;
+ font-weight: var(--fw-600);
}
-.date {
- position: relative;
- top: -1px;
- left: 15px;
- display: inline-block;
+.login_wrapper .login_box .input_form > button {
+ margin-top: 20px;
+}
+.login_wrapper .out_link {
+ text-align: right;
+ margin-top: 20px;
+}
+.login_wrapper .out_link a {
font-size: var(--fs-15);
+ color: var(--color-333);
}
-
-/* 모바일 */
-@media (max-width: 767px){
- header {
- padding: 10px 16px;
- }
- header h1 {
- font-size: 20px;
- }
- header a.nav_menu {
- position: absolute;
- display: block;
- top: 15px;
- right: 15px;
- }
- .container {
- padding: 16px;
- height: 100%;
- overflow: inherit;
- }
- .container h2 {
- margin: 0 0 10px 0;
- }
- .menu_wrap, .menu_right, .breadcrumb {
- display: none;
- }
- .menu_wrap.active {
- position: fixed !important;
- display: block;
- top: 0 !important;
- left: 0 !important;
- width: 100%;
- height: 100%;
- max-width: inherit;
- background-color: #333;
- z-index: 1000;
- }
- .tb_right {
- position: relative;
- margin-bottom: 10px;
- }
- .closeButton {
- display: block;
- }
- .option_wrap ul li {
- width: 100%;
- }
- .position_right {
- position: inherit;
- }
- .wid400 {
- width: 100%;
- }
- .tb_wrapper {
- overflow-x: auto;
- }
- .tb_sty01 {
- width: 1000px;
- }
- th, td {
- font-size: var(--fs-15);
- }
- .count_wrap {
- display: block;
- }
- .count_wrap li {
- flex: none;
- padding: 16px;
- margin-right: 0;
- margin-bottom: 16px;
- }
- .graph {
- padding: 16px;
- }
- .login_box label {
- display: block;
- text-align: left;
- margin-bottom: 5px;
- }
- .login_box {
- width: 92%;
- }
- .login_box input {
- width: 100%;
- }
-
- .login_box input.login_in {
- width: 60%;
- }
-
- /* modal */
- .modal-content {
- width: 92%;
- max-width: inherit;
- }
-
-
+.login_wrapper .out_link a:last-child {
+ margin-left: 10px;
}
-
-/* 테블릿 세로 */
-@media (min-width: 768px) and (max-width: 991px) {
-
+.login_wrapper .sub_discription {
+ font-size: var(--fs-15);
+ color: var(--color-333);
+ margin-top: 60px;
+}
+.login_wrapper .sub_discription li {
+ position: relative;
+ padding: 2px 10px;
}
-/* 테블릿 가로 */
-
-@media (min-width: 992px) and (max-width: 1199px) {
+/* content */
+.content {
+ position: relative;
+ flex: 1;
+ padding: 70px 30px 50px 30px;
}
-
-
-/* 데스크탑 일반 */
-
-@media (min-width: 1200px) {
-
+.con_wrap h3 {
+ display: inline-block;
+ margin-top: 40px;
+}
+.middle_box {
+ position: relative;
+ overflow: hidden;
+ width: 120px;
+ text-align: center;
+}
+.middle_box button {
+ position: absolute;
+ top: 60%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ padding: 10px 15px;
+ max-width: 90px;
+}
+.discription {
+ font-size: var(--fs-15);
+ margin-top: 10px;
+ color: var(--color-333);
}
\ No newline at end of file
diff --git a/poc/admin/src/main/resources/static/css/sub.css b/poc/admin/src/main/resources/static/css/sub.css
deleted file mode 100644
index b74dfb8..0000000
--- a/poc/admin/src/main/resources/static/css/sub.css
+++ /dev/null
@@ -1,136 +0,0 @@
-
-/*20240220 김보라 퍼블수정*/
-html, body {height:calc(100vh - 72px);}
-.wrapper {height:100%}
-#dayKo {margin-left: 20px;}
-.terminal_wrap {margin:20px 0 10px 0; padding:15px; background:#f5f5f5}
-.terminal_wrap .terminal_top{overflow: hidden;}
-.terminal_wrap .terminal_top .terminal_btn {float:right;}
-.terminal_wrap .terminal_list_wrap {border-top:1px solid #ddd; margin: 10px 0 0 0; padding:10px}
-.terminal_list_wrap .terminal_list_in {padding: 5px 0;}
-.terminal_list_wrap .terminal_list_in .checkbox-label {line-height: normal; padding-left: 25px; display: inline;}
-.terminal_list_wrap .terminal_list_in > p {text-align: center;}
-
-.table_radio_wrap {vertical-align: middle;}
-.table_radio_wrap .radio_box {display: inline-block !important; padding-right:10px !important; padding-left: 0; margin-left:0; }
-.table_radio_wrap .radio_box input[type="radio"] + label {position:static;}
-
-.btn_wrap {position: relative; text-align: right; margin-top:10px;}
-.table_select_box, .table_date_box {width: 225px;}
-
-.tb_sty01.tb_sty02 {border-top:1px solid #999}
-
-#batchRegisterTerminalModal .modal-content {max-width: 530px !important}
-#depositDetailModal .modal-content, #withdrawDetailModal .modal-content,
-#transferDetailModal .modal-content, #transferHistoryModal .modal-content {max-width: 750px !important}
-
-.btn_normal.excelbtn {
- height: 36px;
- display: inline-block;
- vertical-align: top;
- line-height: 36px;
-}
-.tb_wrapper.tb_wrapper_x_scroll {overflow-x: auto;}
-.tb_wrapper.tb_wrapper_terminal {max-height: 170px; overflow-y: auto; overflow-x: auto;}
-.wd_auto .tbl_bert_m > th{vertical-align: middle;}
-.wd_auto input {width:100% !important;}
-
-.font_bold{font-weight: bold;}
-.tooltip_prt {position:relative;}
-.tooltip_chd {
- visibility: hidden;
- background-color: black;
- color: #fff;
- text-align: center;
- border-radius: 6px;
- padding: 5px;
- position: absolute;
- z-index: 1;
-
- width: max-content;
- bottom: -5%;
- left: 50%;
- transform: translate(-50%, 50%);
-}
-.tooltip_prt:hover .tooltip_chd {
- visibility: visible;
-}
-table colgroup > col { min-width:max-content !important}
-
-table td > p, table td > a {
- display:block;
- overflow:hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
-}
-
-.mt-05 {
- margin-top: 5px;
-}
-.mt-10 {
- margin-top: 10px;
-}
-
-.tb_wrapper {padding-bottom:35px}
-/*20240226 김현종 퍼블 수정*/
-.clickable_text a:link, .clickable_text a:visited {
- color: blue;
- text-decoration: underline;
- cursor: pointer;
-}
-
-/*20240229 김현종 퍼블 수정*/
-.title_text a {
- color: black; /* 원하는 색상으로 설정 */
- text-decoration: none; /* 밑줄 제거 */
-}
-
-.title_text a:visited {
- color: black; /* 방문한 링크에 대해서도 동일한 색상 유지 */
-}
-
-
-/* 모바일 */
-@media (max-width: 767px){
- .mb_w50 {overflow: hidden; margin-left:-5px;}
- .mb_w50 > span {width:50%; float:left; padding:0 3px !important; box-sizing: border-box;}
- .mb_w50 > span select {width:100%}
-
- table td > p, table td > a {
- overflow: inherit;
- white-space: inherit;
- word-break: break-all;
- }
-
- .tb_w_auto {width:130px !important;}
- .table_wrap h4 { height: auto !important}
- .table_wrap2 .tb_right {position:absolute;}
-}
-
-/* 테블릿 세로 */
-@media (min-width: 768px) and (max-width: 991px) {
- .menu_wrap {
- max-width:200px
- }
-
- .tb_w_auto {width:100px}
-}
-
-
-/* 테블릿 가로 */
-
-@media (min-width: 992px) and (max-width: 1199px) {
- .menu_wrap {
- max-width:200px
- }
-
- .tb_w_auto {width:130px}
-
-}
-
-
-/* 데스크탑 일반 */
-
-@media (min-width: 1200px) {
-
-}
\ No newline at end of file
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Black.woff b/poc/admin/src/main/resources/static/font/Pretendard-Black.woff
new file mode 100644
index 0000000..d07848c
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Black.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Black.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-Black.woff2
new file mode 100644
index 0000000..eafe683
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Black.woff2 differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Bold.woff b/poc/admin/src/main/resources/static/font/Pretendard-Bold.woff
new file mode 100644
index 0000000..7837ae5
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Bold.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Bold.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-Bold.woff2
new file mode 100644
index 0000000..4d40a1a
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Bold.woff2 differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-ExtraBold.woff b/poc/admin/src/main/resources/static/font/Pretendard-ExtraBold.woff
new file mode 100644
index 0000000..8058b76
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-ExtraBold.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-ExtraBold.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-ExtraBold.woff2
new file mode 100644
index 0000000..dcd57e7
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-ExtraBold.woff2 differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-ExtraLight.woff b/poc/admin/src/main/resources/static/font/Pretendard-ExtraLight.woff
new file mode 100644
index 0000000..f9498d8
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-ExtraLight.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-ExtraLight.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-ExtraLight.woff2
new file mode 100644
index 0000000..e510402
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-ExtraLight.woff2 differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Light.woff b/poc/admin/src/main/resources/static/font/Pretendard-Light.woff
new file mode 100644
index 0000000..2cad608
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Light.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Light.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-Light.woff2
new file mode 100644
index 0000000..7f82fe8
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Light.woff2 differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Medium.woff b/poc/admin/src/main/resources/static/font/Pretendard-Medium.woff
new file mode 100644
index 0000000..5370409
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Medium.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Medium.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-Medium.woff2
new file mode 100644
index 0000000..f8c743d
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Medium.woff2 differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Regular.woff b/poc/admin/src/main/resources/static/font/Pretendard-Regular.woff
new file mode 100644
index 0000000..e3b3a35
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Regular.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Regular.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-Regular.woff2
new file mode 100644
index 0000000..a9f6231
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Regular.woff2 differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-SemiBold.woff b/poc/admin/src/main/resources/static/font/Pretendard-SemiBold.woff
new file mode 100644
index 0000000..682e7a4
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-SemiBold.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-SemiBold.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-SemiBold.woff2
new file mode 100644
index 0000000..4c6a32d
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-SemiBold.woff2 differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Thin.woff b/poc/admin/src/main/resources/static/font/Pretendard-Thin.woff
new file mode 100644
index 0000000..d28e448
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Thin.woff differ
diff --git a/poc/admin/src/main/resources/static/font/Pretendard-Thin.woff2 b/poc/admin/src/main/resources/static/font/Pretendard-Thin.woff2
new file mode 100644
index 0000000..6c9bc96
Binary files /dev/null and b/poc/admin/src/main/resources/static/font/Pretendard-Thin.woff2 differ
diff --git a/poc/admin/src/main/resources/static/images/chk_off.svg b/poc/admin/src/main/resources/static/images/chk_off.svg
index 1b747b6..1294f5a 100644
--- a/poc/admin/src/main/resources/static/images/chk_off.svg
+++ b/poc/admin/src/main/resources/static/images/chk_off.svg
@@ -1,6 +1,18 @@
-
+