diff --git a/pom.xml b/pom.xml index 97152c2..11626d1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,21 +15,21 @@ 2.3.5.RELEASE 1.8 1.8 - 3.4.1 - 26.0-jre - 3.7 - 2.6 + 3.4.3 + 30.1.1-jre + 3.12.0 + 2.9.0 1.10 - 0.9.0 - 5.1.2 - 3.8.0 + 0.9.1 + 5.6.6 + 3.12.0 [7.2.0, 7.2.99] 4.2.2 1.7 3.9.0 - 3.0.1 + 3.0.2 0.7.0 - 4.0.0 + 4.1.0 1.2.8 1.2.75 4.0.11 @@ -179,7 +179,7 @@ public aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ + https://maven.aliyun.com/nexus/content/groups/public/ true @@ -190,7 +190,7 @@ public aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ + https://maven.aliyun.com/nexus/content/groups/public/ true diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectController.java index 2b48817..1ce3508 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/ProjectController.java @@ -1,16 +1,19 @@ package com.tduck.cloud.api.web.controller; +import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; +import com.tduck.cloud.account.request.RegisterAccountRequest; +import com.tduck.cloud.account.request.RetrievePasswordRequest; +import com.tduck.cloud.account.service.UserValidateService; import com.tduck.cloud.api.annotation.Login; import com.tduck.cloud.common.mybatis.wrapper.JsonWrappers; import com.tduck.cloud.common.util.Result; +import com.tduck.cloud.common.validator.ValidatorUtils; import com.tduck.cloud.project.entity.ProjectThemeEntity; import com.tduck.cloud.project.request.QueryProThemeRequest; import com.tduck.cloud.project.service.ProjectThemeService; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,7 +28,7 @@ import java.util.List; public class ProjectController { private final ProjectThemeService projectThemeService; - + private final UserValidateService userValidateService; @Login @GetMapping("theme/list") @@ -36,5 +39,28 @@ public class ProjectController { return Result.success(list); } + /** + * 获取发送手机号验证验证码 + */ + @GetMapping("/phone/code") + public Result sendPhoneNumberCode(@RequestParam String phoneNumber) { + Validator.validateMobile(phoneNumber, "手机号码不正确"); + userValidateService.sendPhoneCode(phoneNumber); + return Result.success(); + } + + + /** + * 检查手机号验证码是否正确 + */ + @PostMapping("/phone/code/check") + public Result checkPhoneNumberCode(@RequestBody RetrievePasswordRequest.CheckPhoneCode request) { + Validator.validateMobile(request.getPhoneNumber(), "手机号码不正确"); + ValidatorUtils.validateEntity(request, RegisterAccountRequest.PhoneNumberGroup.class); + if (!userValidateService.checkPhoneCode(request.getPhoneNumber(), request.getCode())) { + return Result.failed("验证码错误"); + } + return Result.success(request.getPhoneNumber()); + } } diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index 260a62a..b67805a 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -1,7 +1,6 @@ package com.tduck.cloud.api.web.controller; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.lang.Validator; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -9,9 +8,6 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Sets; -import com.tduck.cloud.account.request.RegisterAccountRequest; -import com.tduck.cloud.account.request.RetrievePasswordRequest; -import com.tduck.cloud.account.service.UserValidateService; import com.tduck.cloud.api.annotation.Login; import com.tduck.cloud.api.util.HttpUtils; import com.tduck.cloud.common.constant.CommonConstants; @@ -28,6 +24,7 @@ import com.tduck.cloud.project.entity.enums.ProjectSourceTypeEnum; import com.tduck.cloud.project.entity.enums.ProjectStatusEnum; import com.tduck.cloud.project.entity.struct.ItemDefaultValueStruct; import com.tduck.cloud.project.request.OperateProjectItemRequest; +import com.tduck.cloud.project.request.QueryProjectItemRequest; import com.tduck.cloud.project.request.QueryProjectRequest; import com.tduck.cloud.project.request.SortProjectItemRequest; import com.tduck.cloud.project.service.*; @@ -63,7 +60,7 @@ import java.util.stream.Collectors; @RestController @Slf4j public class UserProjectController { - private final UserValidateService userValidateService; + private final UserProjectService projectService; private final UserProjectItemService projectItemService; private final UserProjectResultService projectResultService; @@ -248,11 +245,13 @@ public class UserProjectController { /** * 项目表单项查询 - * */ @GetMapping("/user/project/item/list") - public Result queryProjectItem(@RequestParam @NotBlank String key) { - List itemEntityList = projectItemService.listByProjectKey(key); + public Result queryProjectItem(QueryProjectItemRequest request) { + ValidatorUtils.validateEntity(request); + List itemEntityList = projectItemService.list(Wrappers.lambdaQuery() + .eq(UserProjectItemEntity::getProjectKey, request.getKey()) + .eq(ObjectUtil.isNotNull(request.getDisplayType()), UserProjectItemEntity::getDisplayType, request.getDisplayType())); return Result.success(itemEntityList); } @@ -315,7 +314,6 @@ public class UserProjectController { /** * 表单项删除 - * */ @Login @PostMapping("/user/project/item/delete") @@ -446,7 +444,6 @@ public class UserProjectController { /** * 获取项目微信通知用户 - * */ @GetMapping("/user/project/wx/notify-user") public Result getWxNotifyUser(@RequestParam("key") String projectKey, @RequestParam(required = false) String openIdStr) { @@ -510,28 +507,5 @@ public class UserProjectController { return Result.success(remove); } - /** - * 获取发送手机号验证验证码 - */ - @GetMapping("/project/phone/code") - public Result sendPhoneNumberCode(@RequestParam String phoneNumber) { - Validator.validateMobile(phoneNumber, "手机号码不正确"); - userValidateService.sendPhoneCode(phoneNumber); - return Result.success(); - } - - - /** - * 检查手机号验证码是否正确 - */ - @PostMapping("/project/phone/code/check") - public Result checkPhoneNumberCode(@RequestBody RetrievePasswordRequest.CheckPhoneCode request) { - Validator.validateMobile(request.getPhoneNumber(), "手机号码不正确"); - ValidatorUtils.validateEntity(request, RegisterAccountRequest.PhoneNumberGroup.class); - if (!userValidateService.checkPhoneCode(request.getPhoneNumber(), request.getCode())) { - return Result.failed("验证码错误"); - } - return Result.success(request.getPhoneNumber()); - } } \ No newline at end of file diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectItemRequest.java b/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectItemRequest.java new file mode 100644 index 0000000..e28c4b3 --- /dev/null +++ b/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectItemRequest.java @@ -0,0 +1,25 @@ +package com.tduck.cloud.project.request; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author : wangqing + * @description : 查询项目问题 + * @create : 2021/06/03 14:45 + **/ +@Data +public class QueryProjectItemRequest { + + /** + * 项目key + */ + @NotBlank + private String key; + /** + * 是显示类型 + */ + private Boolean displayType; + +}