diff --git a/src/main/java/com/example/springsecuritystudy/note/AdminController.java b/src/main/java/com/example/springsecuritystudy/admin/AdminController.java
similarity index 84%
rename from src/main/java/com/example/springsecuritystudy/note/AdminController.java
rename to src/main/java/com/example/springsecuritystudy/admin/AdminController.java
index 1a85e80..8d2db44 100644
--- a/src/main/java/com/example/springsecuritystudy/note/AdminController.java
+++ b/src/main/java/com/example/springsecuritystudy/admin/AdminController.java
@@ -1,4 +1,4 @@
-package com.example.springsecuritystudy.note;
+package com.example.springsecuritystudy.admin;
import java.util.List;
@@ -8,6 +8,8 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import com.example.springsecuritystudy.note.Note;
+import com.example.springsecuritystudy.note.NoteService;
import com.example.springsecuritystudy.user.User;
import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/example/springsecuritystudy/config/InitializeConfig.java b/src/main/java/com/example/springsecuritystudy/config/InitializeDefaultConfig.java
similarity index 82%
rename from src/main/java/com/example/springsecuritystudy/config/InitializeConfig.java
rename to src/main/java/com/example/springsecuritystudy/config/InitializeDefaultConfig.java
index 7678c70..bd8a1bf 100644
--- a/src/main/java/com/example/springsecuritystudy/config/InitializeConfig.java
+++ b/src/main/java/com/example/springsecuritystudy/config/InitializeDefaultConfig.java
@@ -1,12 +1,11 @@
package com.example.springsecuritystudy.config;
-import javax.annotation.PostConstruct;
-
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
-import com.example.springsecuritystudy.notice.NoticeService;
import com.example.springsecuritystudy.note.NoteService;
+import com.example.springsecuritystudy.notice.NoticeService;
import com.example.springsecuritystudy.user.User;
import com.example.springsecuritystudy.user.UserService;
@@ -18,26 +17,30 @@ import lombok.RequiredArgsConstructor;
@Configuration
@RequiredArgsConstructor
@Profile(value = "!test")
-public class InitializeConfig {
+public class InitializeDefaultConfig {
private final UserService userService;
private final NoteService noteService;
private final NoticeService noticeService;
/**
- * 유저 등록
- * 1. user / user
2. admin / admin
- * 게시글 등록 4개
- * 공지사항 등록 2개
+ * 유저등록, note 4개 등록
*/
- @PostConstruct
- public void adminAccount() {
+ @Bean
+ public void initializeDefaultUser() {
User user = userService.signup("user", "user");
- userService.signupAdmin("admin", "admin");
noteService.saveNote(user, "테스트", "테스트입니다.");
noteService.saveNote(user, "테스트2", "테스트2입니다.");
noteService.saveNote(user, "테스트3", "테스트3입니다.");
noteService.saveNote(user, "여름 여행계획", "여름 여행계획 작성중...");
+ }
+
+ /**
+ * 어드민등록, 공지사항 2개 등록
+ */
+ @Bean
+ public void initializeDefaultAdmin() {
+ userService.signupAdmin("admin", "admin");
noticeService.saveNotice("환영합니다", "환영합니다 여러분");
noticeService.saveNotice("게시글 작성 방법 공지", "1. 회원가입\n2. 로그인\n3. 게시글 작성\n4. 저장\n* 본인 외에는 게시글을 볼 수 없습니다.");
}
diff --git a/src/main/java/com/example/springsecuritystudy/config/SecurityConfig.java b/src/main/java/com/example/springsecuritystudy/config/SecurityConfig.java
index 9b6e3a1..798bf80 100644
--- a/src/main/java/com/example/springsecuritystudy/config/SecurityConfig.java
+++ b/src/main/java/com/example/springsecuritystudy/config/SecurityConfig.java
@@ -25,7 +25,7 @@ public class SecurityConfig {
.rememberMe();
http
.authorizeHttpRequests(auth -> auth
- .antMatchers("/", "/home", "/signup", "/example",
+ .antMatchers("/", "/home", "/signup",
"/css/**", "/h2-console/**").permitAll()
.antMatchers("/note").hasRole("USER")
.antMatchers("/admin").hasRole("ADMIN")
diff --git a/src/main/java/com/example/springsecuritystudy/controller/SampleController.java b/src/main/java/com/example/springsecuritystudy/controller/SampleController.java
deleted file mode 100644
index 3ecb971..0000000
--- a/src/main/java/com/example/springsecuritystudy/controller/SampleController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.example.springsecuritystudy.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class SampleController {
-
- @GetMapping({"/", "/home"})
- public String index() {
- return "index";
- }
-
- @GetMapping("/example")
- public String example(Model model) {
- model.addAttribute("name", "정우성");
- model.addAttribute("age", 51);
- return "example";
- }
-
-}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ce75a30..94d4b6d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,9 +4,10 @@ server:
session:
timeout: 10m # 기본 30분, 최소는 1분
+# logging 레벨 설정
logging:
level:
- root: info
- org.springframework.web: debug
- sql: error
+ root: INFO
+ sql: ERROR
+# org.springframework.web: debug
# org.springframework.security: debug
diff --git a/src/main/resources/static/images/spring-security.png b/src/main/resources/static/images/spring-security.png
new file mode 100644
index 0000000..45a04b9
Binary files /dev/null and b/src/main/resources/static/images/spring-security.png differ
diff --git a/src/main/resources/templates/example.html b/src/main/resources/templates/example.html
deleted file mode 100644
index eecdd76..0000000
--- a/src/main/resources/templates/example.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
Welcome Spring Security Example
-
당신의 이름은 차현우 입니다.
-
당신의 나이는 0살 입니다.
-
변수는 입니다.
-
당신은 30대가 아닙니다.
-
당신은 30대 이상입니다.
-
- 당신은 정씨 입니다.
- 당신은 감씨 입니다.
-
-
홈으로
-