From b4c3d749df97960cb4cf64e79dc2e83953de5e73 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <773861846@qq.com> Date: Tue, 22 Dec 2020 23:32:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=95=B0=E6=8D=AE=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../novel/user/controller/UserController.java | 4 ---- .../com/java2nb/novel/user/form/UserForm.java | 21 ------------------- .../novel/user/service/UserService.java | 2 -- .../user/service/impl/UserServiceImpl.java | 2 -- 4 files changed, 29 deletions(-) delete mode 100644 novel-user/user-service/src/main/java/com/java2nb/novel/user/form/UserForm.java diff --git a/novel-user/user-service/src/main/java/com/java2nb/novel/user/controller/UserController.java b/novel-user/user-service/src/main/java/com/java2nb/novel/user/controller/UserController.java index 6aac2ff..e5204db 100644 --- a/novel-user/user-service/src/main/java/com/java2nb/novel/user/controller/UserController.java +++ b/novel-user/user-service/src/main/java/com/java2nb/novel/user/controller/UserController.java @@ -1,6 +1,5 @@ package com.java2nb.novel.user.controller; -import com.github.pagehelper.PageInfo; import com.java2nb.novel.book.entity.BookComment; import com.java2nb.novel.common.base.BaseController; import com.java2nb.novel.common.bean.PageBean; @@ -14,7 +13,6 @@ import com.java2nb.novel.common.valid.UpdateGroup; import com.java2nb.novel.user.entity.User; import com.java2nb.novel.user.entity.UserFeedback; import com.java2nb.novel.user.feign.BookFeignClient; -import com.java2nb.novel.user.form.UserForm; import com.java2nb.novel.user.service.UserService; import com.java2nb.novel.user.vo.BookReadHistoryVO; import com.java2nb.novel.user.vo.BookShelfVO; @@ -23,12 +21,10 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; import java.util.HashMap; import java.util.Map; diff --git a/novel-user/user-service/src/main/java/com/java2nb/novel/user/form/UserForm.java b/novel-user/user-service/src/main/java/com/java2nb/novel/user/form/UserForm.java deleted file mode 100644 index 43b1e08..0000000 --- a/novel-user/user-service/src/main/java/com/java2nb/novel/user/form/UserForm.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.java2nb.novel.user.form; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.annotation.Generated; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; - -@Data -public class UserForm { - @NotBlank(message="手机号不能为空！") - @Pattern(regexp="^1[3|4|5|6|7|8|9][0-9]{9}$",message="手机号格式不正确！") - @ApiModelProperty("用户名") - private String username; - - @NotBlank(message="密码不能为空！") - @ApiModelProperty("密码") - private String password; - -} diff --git a/novel-user/user-service/src/main/java/com/java2nb/novel/user/service/UserService.java b/novel-user/user-service/src/main/java/com/java2nb/novel/user/service/UserService.java index 742b2fb..4aba3a0 100644 --- a/novel-user/user-service/src/main/java/com/java2nb/novel/user/service/UserService.java +++ b/novel-user/user-service/src/main/java/com/java2nb/novel/user/service/UserService.java @@ -1,11 +1,9 @@ package com.java2nb.novel.user.service; -import com.java2nb.novel.book.entity.BookComment; import com.java2nb.novel.common.bean.UserDetails; import com.java2nb.novel.user.entity.User; import com.java2nb.novel.user.entity.UserFeedback; -import com.java2nb.novel.user.form.UserForm; import com.java2nb.novel.user.vo.BookReadHistoryVO; import com.java2nb.novel.user.vo.BookShelfVO; diff --git a/novel-user/user-service/src/main/java/com/java2nb/novel/user/service/impl/UserServiceImpl.java b/novel-user/user-service/src/main/java/com/java2nb/novel/user/service/impl/UserServiceImpl.java index 9621f45..23fccf1 100644 --- a/novel-user/user-service/src/main/java/com/java2nb/novel/user/service/impl/UserServiceImpl.java +++ b/novel-user/user-service/src/main/java/com/java2nb/novel/user/service/impl/UserServiceImpl.java @@ -2,7 +2,6 @@ package com.java2nb.novel.user.service.impl; import com.github.pagehelper.PageHelper; import com.java2nb.novel.book.entity.Book; -import com.java2nb.novel.book.entity.BookComment; import com.java2nb.novel.common.bean.UserDetails; import com.java2nb.novel.common.enums.ResponseStatus; import com.java2nb.novel.common.exception.BusinessException; @@ -13,7 +12,6 @@ import com.java2nb.novel.user.entity.UserBookshelf; import com.java2nb.novel.user.entity.UserFeedback; import com.java2nb.novel.user.entity.UserReadHistory; import com.java2nb.novel.user.feign.BookFeignClient; -import com.java2nb.novel.user.form.UserForm; import com.java2nb.novel.user.mapper.*; import com.java2nb.novel.user.service.UserService; import com.java2nb.novel.user.vo.BookReadHistoryVO;