diff --git a/spring-data-jpa-1/initial/src/main/java/cholog/Customer.java b/spring-data-jpa-1/initial/src/main/java/cholog/Customer.java
index 492197fc..98a9f414 100644
--- a/spring-data-jpa-1/initial/src/main/java/cholog/Customer.java
+++ b/spring-data-jpa-1/initial/src/main/java/cholog/Customer.java
@@ -1,7 +1,15 @@
 package cholog;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+@Entity
 public class Customer {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String firstName;
     private String lastName;
diff --git a/spring-data-jpa-1/initial/src/main/java/cholog/CustomerRepository.java b/spring-data-jpa-1/initial/src/main/java/cholog/CustomerRepository.java
index 879c8fe8..d6364e48 100644
--- a/spring-data-jpa-1/initial/src/main/java/cholog/CustomerRepository.java
+++ b/spring-data-jpa-1/initial/src/main/java/cholog/CustomerRepository.java
@@ -1,5 +1,13 @@
 package cholog;
 
-public interface CustomerRepository {
+import org.springframework.data.repository.CrudRepository;
 
+import java.util.List;
+
+public interface CustomerRepository extends CrudRepository<Customer, Long> {
+
+    List<Customer> findByLastName(String lastName);
+    List<Customer> findByLastNameIgnoreCase(String lastName);
+    List<Customer> findByLastNameOrderByFirstNameDesc(String lastName);
 }
+
diff --git a/spring-mvc-1/initial/src/main/java/cholog/MemberController.java b/spring-mvc-1/initial/src/main/java/cholog/MemberController.java
index 08322a4e..0a8199d8 100644
--- a/spring-mvc-1/initial/src/main/java/cholog/MemberController.java
+++ b/spring-mvc-1/initial/src/main/java/cholog/MemberController.java
@@ -1,18 +1,33 @@
 package cholog;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 public class MemberController {
-
-    public String world() {
+    @GetMapping("/hello")
+    public String world(@RequestParam(name = "name", required = false)  String name, Model model) {
         // TODO: /hello 요청 시 resources/templates/static.html 페이지가 응답할 수 있도록 설정하세요.
         // TODO: 쿼리 파라미터로 name 요청이 들어왔을 때 해당 값을 hello.html에서 사용할 수 있도록 하세요.
-        return null;
+        if (name == null){
+            // 쿼리 파라미터가 없는 경우
+            return "static";
+        } else {
+            // 쿼리 파라미터가 있는 경우.
+            model.addAttribute("name", name);
+            return "hello";
+        }
+
+
     }
 
+    @GetMapping("/json")
+    @ResponseBody
     public Person json() {
         // TODO: /json 요청 시 {"name": "brown", "age": 20} 데이터를 응답할 수 있도록 설정하세요.
-        return null;
+        return new Person("brown", 20);
     }
 }
diff --git a/spring-mvc-1/initial/src/main/resources/static/hi.html b/spring-mvc-1/initial/src/main/resources/static/index.html
similarity index 100%
rename from spring-mvc-1/initial/src/main/resources/static/hi.html
rename to spring-mvc-1/initial/src/main/resources/static/index.html
diff --git a/spring-mvc-1/initial/src/main/resources/templates/static.html b/spring-mvc-1/initial/src/main/resources/static/static.html
similarity index 100%
rename from spring-mvc-1/initial/src/main/resources/templates/static.html
rename to spring-mvc-1/initial/src/main/resources/static/static.html
diff --git a/spring-mvc-2/initial/src/main/java/cholog/MemberController.java b/spring-mvc-2/initial/src/main/java/cholog/MemberController.java
index 5a380e7a..927d98a4 100644
--- a/spring-mvc-2/initial/src/main/java/cholog/MemberController.java
+++ b/spring-mvc-2/initial/src/main/java/cholog/MemberController.java
@@ -5,12 +5,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
+
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.*;
 
 @Controller
 public class MemberController {
@@ -19,9 +18,9 @@ public class MemberController {
     private final AtomicLong index = new AtomicLong(1);
 
     @PostMapping("/members")
-    public ResponseEntity<Void> create() {
+    public ResponseEntity<Void> create(@RequestBody Member member) {
         // TODO: member 정보를 받아서 생성한다.
-        Member newMember = Member.toEntity(null, index.getAndIncrement());
+        Member newMember = Member.toEntity(member, index.getAndIncrement());
         members.add(newMember);
         return ResponseEntity.created(URI.create("/members/" + newMember.getId())).build();
     }
@@ -29,31 +28,32 @@ public ResponseEntity<Void> create() {
     @GetMapping("/members")
     public ResponseEntity<List<Member>> read() {
         // TODO: 저장된 모든 member 정보를 반환한다.
-        return null;
+        return new ResponseEntity<>(members, HttpStatus.OK);
     }
 
     @PutMapping("/members/{id}")
-    public ResponseEntity<Void> update() {
+    public ResponseEntity<Void> update(@PathVariable Long id, @RequestBody Member newMember) {
         // TODO: member의 수정 정보와 url 상의 id 정보를 받아 member 정보를 수정한다.
         Member member = members.stream()
-            .filter(it -> Objects.equals(it.getId(), null))
+            .filter(it -> Objects.equals(it.getId(), id))
             .findFirst()
             .orElseThrow(RuntimeException::new);
 
-        member.update(null);
+        member.update(newMember);
+        //return new ResponseEntity<>(null, HttpStatus.NO_CONTENT); 이건 왜 안되는지?
         return null;
     }
 
     @DeleteMapping("/members/{id}")
-    public ResponseEntity<Void> delete() {
+    public ResponseEntity<Void> delete(@PathVariable Long id) {
         // TODO: url 상의 id 정보를 받아 member를 삭제한다.
         Member member = members.stream()
-            .filter(it -> Objects.equals(it.getId(), null))
+            .filter(it -> Objects.equals(it.getId(), id))
             .findFirst()
             .orElseThrow(RuntimeException::new);
 
         members.remove(member);
 
-        return null;
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 }