diff --git a/src/main/java/com/zhangmeng/online/exam/controller/InitController.java b/src/main/java/com/zhangmeng/online/exam/controller/InitController.java
index ad4477e..7e0fd67 100644
--- a/src/main/java/com/zhangmeng/online/exam/controller/InitController.java
+++ b/src/main/java/com/zhangmeng/online/exam/controller/InitController.java
@@ -4,6 +4,7 @@ import com.zhangmeng.online.exam.dao.*;
 import com.zhangmeng.online.exam.dto.Result;
 import com.zhangmeng.online.exam.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author zm
@@ -128,6 +130,7 @@ public class InitController {
 
         Role role = new Role();
         role.setName("管理员");
+        role.setType(Role.Type.ADMIN);
         role.setDescription("管理员");
         role.getPermissions().add(p1);
         role.getPermissions().add(p2);
@@ -143,15 +146,28 @@ public class InitController {
 
         User admin = new User();
         admin.setUsername("admin");
-        admin.setPassword("123456");
+        admin.setPassword(encoder());
         admin.setEmail("admin@admin.com");
         admin.setPhone("13800138000");
         admin.getRoles().add(role);
+        admin.setStatus(User.Status.VALID);
         userDao.save(admin);
 
+        User user = new User();
+        user.setUsername("student");
+        user.setPassword(encoder());
+        user.setEmail("admin@admin.com");
+        user.setPhone("13800138000");
+        user.setStatus(User.Status.VALID);
+        userDao.save(user);
+
         subjectInitData();
     }
 
+    public static String  encoder(){
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        return encoder.encode("123456");
+    }
 
     @Autowired
     private SubjectDao subjectDao;
@@ -228,6 +244,8 @@ public class InitController {
         profession.setName("学生");
         profession.setSubjects(subjectList);
         professionDao.save(profession);
+
+        questionInitData();
     }
 
     @Autowired
@@ -641,6 +659,13 @@ public class InitController {
 
         question.setOptions(Arrays.asList(optionA, optionB, optionC, optionD));
 
+        test1();
+        test2();
+        test3();
+        test4();
+        test6();
+        test7();
+
     }
 
 
@@ -901,16 +926,41 @@ public class InitController {
         this.questionOptionDao.save(optionD);
 
         question.setOptions(Arrays.asList(optionA, optionB, optionC,optionD));
-
-
     }
 
-
-    @GetMapping("/test6")
+    @GetMapping("/test7")
     public void test7() {
-        Subject subject = this.subjectDao.findByCode("001");
-
+        Optional<User> userOptional = this.userDao.findById(2L);
+        if (userOptional.isPresent()){
+            User user = userOptional.get();
+            Role role = new Role();
+            role.setName("学生");
+            role.setDescription("学生");
+            role.setType(Role.Type.STUDENT);
+            roleDao.save(role);
+            user.getRoles().add(role);
+            userDao.save(user);
+
+            Permission permission = new Permission();
+            permission.setName("试题管理");
+            permission.setDescription("试题管理");
+            permissionDao.save(permission);
+
+            Permission permission2 = new Permission();
+            permission2.setName("试题列表");
+            permission2.setDescription("试题列表");
+            permission2.setUrl("/exam/list");
+            permission2.setIcon("exam-list");
+            permission2.setSort(2);
+            permission2.setFrontpath("/exam/list");
+            permission2.setParent(permission);
+            permissionDao.save(permission2);
+
+            role.getPermissions().add(permission);
+            role.getPermissions().add(permission2);
+            roleDao.save(role);
 
 
+        }
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f4b6c24..2d39e89 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,4 +43,5 @@ jwt:
       - /v3/api-docs
       - /doc.html
       - /webjars/**
-      - /favicon.ico # ??FAVICON
\ No newline at end of file
+      - /favicon.ico # ??FAVICON
+      - /init/data
\ No newline at end of file