update test and fix bug

sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthResourceDO.java

@@ -47,7 +47,6 @@ public class AuthResourceDO {
     @NotBlank(message = "method can not null")
     private String method;
 
-    @NotBlank(message = "status can not null")
     @Range(min = 0, max = 9, message = "1 enable, 9 disable")
     private Integer status;
 

sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthRoleDO.java

@@ -40,7 +40,6 @@ public class AuthRoleDO {
     @Length(min = 3, max = 100, message = "code length in 3-100")
     private String code;
 
-    @NotBlank(message = "status can not null")
     @Range(min = 0, max = 9, message = "1 enable, 9 disable")
     private Integer status;
 

sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthRoleResourceBindDO.java

@@ -10,7 +10,8 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 import java.time.LocalDateTime;
 
 /**
@@ -30,10 +31,10 @@ public class AuthRoleResourceBindDO {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @NotBlank(message = "roleId can not null")
+    @NotNull(message = "roleId can not null")
     private Long roleId;
 
-    @NotBlank(message = "resourceId can not null")
+    @NotNull(message = "resourceId can not null")
     private Long resourceId;
 
     private LocalDateTime gmtCreate;

sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthUserDO.java

@@ -50,7 +50,6 @@ public class AuthUserDO {
 
     private Integer sex;
 
-    @NotBlank(message = "status can not null")
     @Range(min = 0, max = 9, message = "1 enable, 2 locked, 3 deleted, 4 illegal")
     private Integer status;
 

sample-tom/src/main/java/com/usthe/sureness/sample/tom/pojo/entity/AuthUserRoleBindDO.java

@@ -10,7 +10,7 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -30,10 +30,10 @@ public class AuthUserRoleBindDO {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @NotBlank(message = "userId can not null")
+    @NotNull(message = "userId can not null")
     private Long userId;
 
-    @NotBlank(message = "roleId can not null")
+    @NotNull(message = "roleId can not null")
     private Long roleId;
 
     private LocalDateTime gmtCreate;

sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthResourceDaoTest.java

@@ -27,7 +27,7 @@ class AuthResourceDaoTest extends TomApplicationTest {
         AuthResourceDO resource = AuthResourceDO.builder()
                 .name("角色管理").code("ROLE_MANAGE")
                 .uri("/index/role").status(1)
-                .build();
+                .method("post").build();
         resource = authResourceDao.save(resource);
         Assertions.assertThat(resource).isNotNull();
     }
@@ -41,13 +41,13 @@ class AuthResourceDaoTest extends TomApplicationTest {
         AuthResourceDO resource = AuthResourceDO.builder()
                 .name("角色管理").code("ROLE_MANAGE")
                 .uri("/index/role").status(1)
-                .build();
+                .method("post").build();
         resource  = authResourceDao.saveAndFlush(resource);
         AuthResourceDO resourceUpdate = AuthResourceDO.builder()
                 .id(resource.getId())
                 .name("角色管理2").code("ROLE_MANAGE2")
                 .uri("/index/role2").status(2)
-                .build();
+                .method("get").build();
         resourceUpdate = authResourceDao.saveAndFlush(resourceUpdate);
         authResourceDao.delete(resourceUpdate);
         Assertions.assertThat(resourceUpdate).isNotNull().isNotEqualTo(resource);
@@ -60,7 +60,7 @@ class AuthResourceDaoTest extends TomApplicationTest {
         AuthResourceDO resource = AuthResourceDO.builder()
                 .name("角色管理").code("ROLE_MANAGE")
                 .uri("/index/role").status(1)
-                .build();
+                .method("post").build();
         resource = authResourceDao.save(resource);
         authResourceDao.delete(resource);
         Assertions.assertThat(authResourceDao.findById(resource.getId()).isPresent()).isFalse();

sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthRoleResourceBindDaoTest.java

@@ -55,11 +55,13 @@ class AuthRoleResourceBindDaoTest extends TomApplicationTest {
         AuthResourceDO resource1 = AuthResourceDO.builder()
                 .name("角色管理").code("ROLE_MANAGE")
                 .uri("/index/role").status(1)
+                .method("post")
                 .build();
         resourceDao.save(resource1);
         AuthResourceDO resource2 = AuthResourceDO.builder()
                 .name("资源管理").code("RESOURCE_MANAGE")
                 .uri("/index/resource").status(1)
+                .method("get")
                 .build();
         resourceDao.save(resource2);
         AuthRoleDO authRole = AuthRoleDO.builder()

sample-tom/src/test/java/com/usthe/sureness/sample/tom/dao/AuthUserRoleBindDaoTest.java

@@ -61,7 +61,8 @@ class AuthUserRoleBindDaoTest extends TomApplicationTest {
                 .status(1).build();
         roleDao.save(authRole2);
         AuthUserDO authUser = AuthUserDO.builder()
-                .username("tom").password("1234").build();
+                .username("tom").password("1234")
+                .status(1).build();
         userDao.save(authUser);
         AuthUserRoleBindDO userRoleBind = AuthUserRoleBindDO.builder()
                 .userId(authUser.getId()).roleId(authRole1.getId()).build();