diff --git a/hsweb-commons/hsweb-commons-controller/src/main/java/org/hswebframework/web/controller/CreateController.java b/hsweb-commons/hsweb-commons-controller/src/main/java/org/hswebframework/web/controller/CreateController.java index 7f026f8af..9220af5d7 100644 --- a/hsweb-commons/hsweb-commons-controller/src/main/java/org/hswebframework/web/controller/CreateController.java +++ b/hsweb-commons/hsweb-commons-controller/src/main/java/org/hswebframework/web/controller/CreateController.java @@ -26,7 +26,9 @@ import org.hswebframework.web.controller.message.ResponseMessage; import org.hswebframework.web.logging.AccessLogger; import org.hswebframework.web.service.CreateEntityService; import org.hswebframework.web.service.InsertService; +import org.hswebframework.web.validator.group.CreateGroup; import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/hsweb-commons/hsweb-commons-entity/pom.xml b/hsweb-commons/hsweb-commons-entity/pom.xml index d4c30cdba..9df6f6800 100644 --- a/hsweb-commons/hsweb-commons-entity/pom.xml +++ b/hsweb-commons/hsweb-commons-entity/pom.xml @@ -40,6 +40,11 @@ hsweb-easy-orm-rdb true + + org.hswebframework.web + hsweb-boost-validator-group + ${project.version} + org.hswebframework hsweb-utils diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/AuthorizationSettingController.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/AuthorizationSettingController.java index 9ae1152ec..29172e2d6 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/AuthorizationSettingController.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/AuthorizationSettingController.java @@ -20,7 +20,6 @@ package org.hswebframework.web.controller.authorization; import org.hswebframework.web.authorization.Permission; import org.hswebframework.web.authorization.annotation.Authorize; import org.hswebframework.web.commons.entity.param.QueryParamEntity; -import org.hswebframework.web.controller.GenericEntityController; import org.hswebframework.web.controller.SimpleGenericEntityController; import org.hswebframework.web.controller.message.ResponseMessage; import org.hswebframework.web.entity.authorization.AuthorizationSettingEntity; diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/MenuController.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/MenuController.java index ad40ab1a7..ba231bd73 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/MenuController.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/MenuController.java @@ -29,7 +29,6 @@ import org.hswebframework.web.controller.message.ResponseMessage; import org.hswebframework.web.entity.authorization.MenuEntity; import org.hswebframework.web.entity.authorization.UserMenuEntity; import org.hswebframework.web.logging.AccessLogger; -import org.hswebframework.web.service.authorization.MenuGroupService; import org.hswebframework.web.service.authorization.MenuService; import org.hswebframework.web.service.authorization.UserMenuManagerService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingDetailEntity.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingDetailEntity.java index 592b66d51..383fe6f7f 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingDetailEntity.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingDetailEntity.java @@ -16,7 +16,9 @@ */ package org.hswebframework.web.entity.authorization; +import org.hibernate.validator.constraints.NotBlank; import org.hswebframework.web.commons.entity.GenericEntity; +import org.hswebframework.web.validator.group.CreateGroup; import java.util.List; import java.util.Set; @@ -57,6 +59,7 @@ public interface AuthorizationSettingDetailEntity extends GenericEntity, /** * @return 权限id */ + @NotBlank(groups = CreateGroup.class) String getPermissionId(); /** @@ -67,6 +70,7 @@ public interface AuthorizationSettingDetailEntity extends GenericEntity, /** * @return 设置id */ + @NotBlank(groups = CreateGroup.class) String getSettingId(); /** diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingEntity.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingEntity.java index 3929109cc..361df3a9c 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingEntity.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/AuthorizationSettingEntity.java @@ -16,7 +16,9 @@ */ package org.hswebframework.web.entity.authorization; +import org.hibernate.validator.constraints.NotBlank; import org.hswebframework.web.commons.entity.GenericEntity; +import org.hswebframework.web.validator.group.CreateGroup; import java.util.List; @@ -49,6 +51,7 @@ public interface AuthorizationSettingEntity extends GenericEntity { /** * @return 类型 */ + @NotBlank(groups = CreateGroup.class) String getType(); /** @@ -59,6 +62,7 @@ public interface AuthorizationSettingEntity extends GenericEntity { /** * @return 设置给谁 */ + @NotBlank(groups = CreateGroup.class) String getSettingFor(); /** diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/MenuEntity.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/MenuEntity.java index 872c2119a..1c64fc4eb 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/MenuEntity.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/MenuEntity.java @@ -27,6 +27,7 @@ import java.util.List; */ public interface MenuEntity extends TreeSortSupportEntity { + String getName(); void setName(String name); diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index 5a35c629e..60760a417 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -36,6 +36,7 @@ import org.hswebframework.web.service.DefaultDSLQueryService; import org.hswebframework.web.service.GenericEntityService; import org.hswebframework.web.service.authorization.*; import org.hswebframework.web.service.authorization.AuthorizationSettingTypeSupplier.SettingInfo; +import org.hswebframework.web.validator.group.CreateGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; @@ -128,7 +129,7 @@ public class SimpleAuthorizationSettingService extends GenericEntityService userEntity.setSalt(IDGenerator.RANDOM.generate()); userEntity.setStatus(DataStatus.STATUS_ENABLED); //验证其他属性 - tryValidate(userEntity); + tryValidate(userEntity, CreateGroup.class); //密码MD5 userEntity.setPassword(encodePassword(userEntity.getPassword(), userEntity.getSalt())); //创建用户 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/starter/authorization/AuthorizationSettingTests.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/starter/authorization/AuthorizationSettingTests.java index 9b3112943..4a684f4c2 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/starter/authorization/AuthorizationSettingTests.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/starter/authorization/AuthorizationSettingTests.java @@ -69,7 +69,6 @@ public class AuthorizationSettingTests extends SimpleWebApplicationTests { //todo 修改测试属性 AuthorizationSettingEntity newEntity = entityFactory.newInstance(AuthorizationSettingEntity.class); newEntity.setId("test"); - newEntity.setDescribe("测试2"); result = testPut("/autz-setting/" + id) .setUp(setup ->