diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java index 6918c7d9..f87f5236 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java @@ -8,6 +8,7 @@ import com.mdd.common.core.AjaxResult; import com.mdd.common.enums.AlbumEnum; import com.mdd.common.exception.OperateException; import com.mdd.common.plugin.storage.StorageDriver; +import com.mdd.common.plugin.storage.UploadFilesVo; import com.mdd.common.utils.StringUtil; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,7 +25,7 @@ import java.util.Map; * 上传管理 */ @RestController -@RequestMapping("api/common/upload") +@RequestMapping("api/upload") public class UploadController { @Resource @@ -35,43 +36,38 @@ public class UploadController { * * @author fzr * @param request 请求对象 - * @return AjaxResult + * @return AjaxResult */ @Log(title = "上传图片", requestType = RequestType.File) @PostMapping("/image") - public AjaxResult image(HttpServletRequest request) { + public AjaxResult image(HttpServletRequest request) { MultipartFile multipartFile; try { multipartFile = ((MultipartRequest) request).getFile("file"); } catch (Exception e) { - return AjaxResult.failed("请正确选择上传图片"); + throw new OperateException("请正确选择上传图片!"); } if (multipartFile == null) { - return AjaxResult.failed("请选择上传图片"); + throw new OperateException("请选择上传图片!"); } - try { - StorageDriver storageDriver = new StorageDriver(); - Map map = storageDriver.upload(multipartFile, "image", AlbumEnum.IMAGE.getCode()); - String cid = StringUtil.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0"; + StorageDriver storageDriver = new StorageDriver(); + UploadFilesVo vo = storageDriver.upload(multipartFile, "image", AlbumEnum.IMAGE.getCode()); + String cid = StringUtil.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0"; - Map album = new LinkedHashMap<>(); - album.put("aid", String.valueOf(LikeAdminThreadLocal.getAdminId())); - album.put("cid", cid); - album.put("type", String.valueOf(AlbumEnum.IMAGE.getCode())); - album.put("size", map.get("size").toString()); - album.put("ext", map.get("ext").toString()); - album.put("url", map.get("url").toString()); - album.put("name", map.get("name").toString()); - Integer id = iAlbumsService.albumAdd(album); + Map album = new LinkedHashMap<>(); + album.put("aid", String.valueOf(LikeAdminThreadLocal.getAdminId())); + album.put("cid", cid); + album.put("type", String.valueOf(AlbumEnum.IMAGE.getCode())); + album.put("size", vo.getSize().toString()); + album.put("ext", vo.getExt()); + album.put("url", vo.getUrl()); + album.put("name", vo.getName()); + Integer id = iAlbumsService.albumAdd(album); - map.put("id", id); - - return AjaxResult.success(map); - } catch (OperateException e) { - return AjaxResult.failed(e.getMsg()); - } + vo.setId(id); + return AjaxResult.success(vo); } /** @@ -79,43 +75,38 @@ public class UploadController { * * @author fzr * @param request 请求对象 - * @return AjaxResult + * @return AjaxResult */ @Log(title = "上传视频", requestType = RequestType.File) @PostMapping("/video") - public AjaxResult video(HttpServletRequest request) { + public AjaxResult video(HttpServletRequest request) { MultipartFile multipartFile; try { multipartFile = ((MultipartRequest) request).getFile("file"); } catch (Exception e) { - return AjaxResult.failed("请正确选择上传视频"); + throw new OperateException("请选择上传视频!"); } if (multipartFile == null) { - return AjaxResult.failed("请选择上传视频"); + throw new OperateException("请选择上传视频!"); } - try { - StorageDriver storageDriver = new StorageDriver(); - Map map = storageDriver.upload(multipartFile, "video", AlbumEnum.Video.getCode()); - String cid = StringUtil.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0"; + StorageDriver storageDriver = new StorageDriver(); + UploadFilesVo vo = storageDriver.upload(multipartFile, "video", AlbumEnum.Video.getCode()); + String cid = StringUtil.isNotEmpty(request.getParameter("cid")) ? request.getParameter("cid") : "0"; - Map album = new LinkedHashMap<>(); - album.put("cid", cid); - album.put("aid", String.valueOf(LikeAdminThreadLocal.getAdminId())); - album.put("type", String.valueOf(AlbumEnum.Video.getCode())); - album.put("ext", map.get("ext").toString()); - album.put("size", map.get("size").toString()); - album.put("url", map.get("url").toString()); - album.put("name", map.get("name").toString()); - Integer id = iAlbumsService.albumAdd(album); + Map album = new LinkedHashMap<>(); + album.put("cid", cid); + album.put("aid", String.valueOf(LikeAdminThreadLocal.getAdminId())); + album.put("type", String.valueOf(AlbumEnum.Video.getCode())); + album.put("ext", vo.getExt()); + album.put("size", vo.getSize().toString()); + album.put("url", vo.getUrl()); + album.put("name", vo.getName()); + Integer id = iAlbumsService.albumAdd(album); - map.put("id", id); - - return AjaxResult.success(map); - } catch (OperateException e) { - return AjaxResult.failed(e.getMsg()); - } + vo.setId(id); + return AjaxResult.success(vo); } } diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java b/server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java index ed4b4ddd..39439985 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/notice/engine/SmsNotice.java @@ -48,7 +48,7 @@ public class SmsNotice { // 通知类型: [1=业务, 2=验证码] if (smsTemplate.getType().equals(2) && StringUtil.isNotNull(params.get("code"))) { String code = params.get("code").toLowerCase(); - RedisUtil.set(GlobalConfig.redisSmsCode+scene+":"+mobile, code); + RedisUtil.set(GlobalConfig.redisSmsCode+scene+":"+mobile, code, 900); } } } diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/storage/StorageDriver.java b/server/like-common/src/main/java/com/mdd/common/plugin/storage/StorageDriver.java index ac6d3050..09e16759 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/storage/StorageDriver.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/storage/StorageDriver.java @@ -31,13 +31,13 @@ public class StorageDriver { public StorageDriver() { this.engine = ConfigUtil.get("storage", "default", "local"); - Map config1; - config1 = ConfigUtil.getMap("storage", this.engine); - if (config1 == null) { - config1 = new HashMap<>(); + Map config; + config = ConfigUtil.getMap("storage", this.engine); + if (config == null) { + config = new HashMap<>(); } - this.config = config1; + this.config = config; } /** @@ -47,8 +47,9 @@ public class StorageDriver { * @param multipartFile 文件对象 * @param folder 文件夹 * @param type 类型: 10=图片, 20=视频 + * @return UploadFilesVo */ - public Map upload(MultipartFile multipartFile, String folder, Integer type) { + public UploadFilesVo upload(MultipartFile multipartFile, String folder, Integer type) { this.checkFile(multipartFile, type); String key = this.buildSaveName(multipartFile); switch (this.engine) { @@ -74,14 +75,22 @@ public class StorageDriver { String origFileExt = origFileName.substring(origFileName.lastIndexOf(".")).replace(".", ""); String newFileName = folder + "/" + key; - Map map = new LinkedHashMap<>(); - map.put("id", 0); - map.put("name", multipartFile.getOriginalFilename()); - map.put("size", multipartFile.getSize()); - map.put("ext", origFileExt.toLowerCase()); - map.put("url", newFileName); - map.put("path", UrlUtil.toAbsoluteUrl(newFileName)); - return map; + UploadFilesVo vo = new UploadFilesVo(); + vo.setId(0); + vo.setName(multipartFile.getOriginalFilename()); + vo.setSize(multipartFile.getSize()); + vo.setExt(origFileExt.toLowerCase()); + vo.setUrl(newFileName); + vo.setPath(UrlUtil.toAbsoluteUrl(newFileName)); + +// Map map = new LinkedHashMap<>(); +// map.put("id", 0); +// map.put("name", multipartFile.getOriginalFilename()); +// map.put("size", multipartFile.getSize()); +// map.put("ext", origFileExt.toLowerCase()); +// map.put("url", newFileName); +// map.put("path", UrlUtil.toAbsoluteUrl(newFileName)); + return vo; } /** diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/storage/UploadFilesVo.java b/server/like-common/src/main/java/com/mdd/common/plugin/storage/UploadFilesVo.java new file mode 100644 index 00000000..1aa3930a --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/plugin/storage/UploadFilesVo.java @@ -0,0 +1,19 @@ +package com.mdd.common.plugin.storage; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class UploadFilesVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + private String name; + private Long size; + private String ext; + private String url; + private String path; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java index 5e1d3a24..14a2865b 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java @@ -1,22 +1,21 @@ package com.mdd.front.controller; -import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.validator.annotation.IDMust; import com.mdd.front.LikeFrontThreadLocal; import com.mdd.front.service.IArticleService; -import com.mdd.front.validate.PageValidate; +import com.mdd.front.validate.ArticleCollectValidate; +import com.mdd.front.validate.commons.PageValidate; import com.mdd.front.vo.article.ArticleCateVo; import com.mdd.front.vo.article.ArticleCollectVo; import com.mdd.front.vo.article.ArticleDetailVo; -import com.mdd.front.vo.article.ArticleListVo; +import com.mdd.front.vo.article.ArticleListedVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; -import java.util.Map; /** * 文章管理 @@ -47,10 +46,10 @@ public class ArticleController { * @return AjaxResult> */ @GetMapping("/list") - public AjaxResult> list(@Validated PageValidate pageValidate, - @RequestParam(value = "cid", defaultValue = "0") Integer cid) { + public AjaxResult> list(@Validated PageValidate pageValidate, + @RequestParam(value = "cid", defaultValue = "0") Integer cid) { Integer userId = LikeFrontThreadLocal.getUserId(); - PageResult list = iArticleService.list(pageValidate, cid, userId); + PageResult list = iArticleService.list(pageValidate, cid, userId); return AjaxResult.success(list); } @@ -85,13 +84,12 @@ public class ArticleController { * 加入收藏 * * @author fzr - * @param params 参数 + * @param collectValidate 参数 * @return AjaxResult */ @PostMapping("/addCollect") - public AjaxResult addCollect(@RequestBody Map params) { - Assert.notNull(params.get("articleId"), "articleId参数缺失"); - Integer articleId = Integer.parseInt(params.get("articleId")); + public AjaxResult addCollect(@Validated @RequestBody ArticleCollectValidate collectValidate) { + Integer articleId = collectValidate.getArticleId(); Integer userId = LikeFrontThreadLocal.getUserId(); iArticleService.addCollect(articleId, userId); return AjaxResult.success(); @@ -101,13 +99,12 @@ public class ArticleController { * 取消收藏 * * @author fzr - * @param params 参数 + * @param collectValidate 参数 * @return AjaxResult */ @PostMapping("/cancelCollect") - public AjaxResult cancelCollect(@RequestBody Map params) { - Assert.notNull(params.get("articleId"), "id参数缺失"); - Integer articleId = Integer.parseInt(params.get("articleId")); + public AjaxResult cancelCollect(@Validated @RequestBody ArticleCollectValidate collectValidate) { + Integer articleId = collectValidate.getArticleId(); Integer userId = LikeFrontThreadLocal.getUserId(); iArticleService.cancelCollect(articleId, userId); return AjaxResult.success(); diff --git a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java index 1d936193..1e178799 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java @@ -4,8 +4,8 @@ import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.validator.annotation.IDMust; import com.mdd.front.service.IIndexService; -import com.mdd.front.validate.PageValidate; -import com.mdd.front.vo.article.ArticleListVo; +import com.mdd.front.validate.commons.PageValidate; +import com.mdd.front.vo.article.ArticleListedVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -97,9 +97,9 @@ public class IndexController { * @return AjaxResult> */ @GetMapping("/search") - public AjaxResult> search(@Validated PageValidate pageValidate, - @RequestParam Map params) { - PageResult list = iIndexService.search(pageValidate, params); + public AjaxResult> search(@Validated PageValidate pageValidate, + @RequestParam Map params) { + PageResult list = iIndexService.search(pageValidate, params); return AjaxResult.success(list); } diff --git a/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java b/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java index f165c97c..1ea9bf50 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/LoginController.java @@ -3,13 +3,14 @@ package com.mdd.front.controller; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.core.AjaxResult; import com.mdd.front.service.ILoginService; -import com.mdd.front.validate.RegValidate; +import com.mdd.front.validate.UserRegisterValidate; +import com.mdd.front.vo.LoginCodesVo; +import com.mdd.front.vo.LoginTokenVo; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.LinkedHashMap; import java.util.Map; /** @@ -27,12 +28,12 @@ public class LoginController { * 注册账号 * * @author fzr - * @param regValidate 参数 + * @param userRegisterValidate 参数 * @return AjaxResult */ @PostMapping("/register") - public AjaxResult register(@Validated @RequestBody RegValidate regValidate) { - iLoginService.register(regValidate); + public AjaxResult register(@Validated @RequestBody UserRegisterValidate userRegisterValidate) { + iLoginService.register(userRegisterValidate); return AjaxResult.success(); } @@ -41,24 +42,24 @@ public class LoginController { * * @author fzr * @param params 参数 - * @return AjaxResult> + * @return AjaxResult */ @PostMapping("/check") - public AjaxResult> check(@RequestBody Map params) { + public AjaxResult check(@RequestBody Map params) { Assert.notNull(params.get("scene"), "scene参数缺失!"); - Map map = new LinkedHashMap<>(); + LoginTokenVo vo = new LoginTokenVo(); switch (params.get("scene")) { case "mnp": - map = iLoginService.mnpLogin(params); + vo = iLoginService.mnpLogin(params); break; case "mobile": - map = iLoginService.mobileLogin(params); + vo = iLoginService.mobileLogin(params); break; case "account": - map = iLoginService.accountLogin(params); + vo = iLoginService.accountLogin(params); break; } - return AjaxResult.success(map); + return AjaxResult.success(vo); } /** @@ -66,12 +67,12 @@ public class LoginController { * * @author fzr * @param params 参数 - * @return AjaxResult> + * @return AjaxResult */ @GetMapping("/oaLogin") - public AjaxResult> oaLogin(@RequestParam Map params) { - Map map = iLoginService.officeLogin(params); - return AjaxResult.success(map); + public AjaxResult oaLogin(@RequestParam Map params) { + LoginTokenVo vo = iLoginService.officeLogin(params); + return AjaxResult.success(vo); } /** @@ -79,15 +80,15 @@ public class LoginController { * * @author fzr * @param url 连接 - * @return AjaxResult> + * @return AjaxResult */ @GetMapping("/codeUrl") - public AjaxResult> codeUrl(@RequestParam String url) { + public AjaxResult codeUrl(@RequestParam String url) { Assert.notNull(url, "url参数不能为空"); - String uri = iLoginService.codeUrl(url); - Map response = new LinkedHashMap<>(); - response.put("url", uri); - return AjaxResult.success(response); + + LoginCodesVo vo = new LoginCodesVo(); + vo.setUrl(iLoginService.codeUrl(url)); + return AjaxResult.success(vo); } /** diff --git a/server/like-front/src/main/java/com/mdd/front/controller/SmsController.java b/server/like-front/src/main/java/com/mdd/front/controller/SmsController.java index 26724cb9..5a3f4dbd 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/SmsController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/SmsController.java @@ -10,7 +10,7 @@ import com.mdd.common.plugin.notice.NoticeDriver; import com.mdd.common.plugin.notice.NoticeParams; import com.mdd.common.utils.StringUtil; import com.mdd.common.utils.ToolsUtil; -import com.mdd.front.validate.SmsValidate; +import com.mdd.front.validate.commons.SmsValidate; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java b/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java index 6dd10da2..56a74bad 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java @@ -2,7 +2,9 @@ package com.mdd.front.controller; import com.mdd.common.core.AjaxResult; import com.mdd.common.enums.AlbumEnum; +import com.mdd.common.exception.OperateException; import com.mdd.common.plugin.storage.StorageDriver; +import com.mdd.common.plugin.storage.UploadFilesVo; import com.mdd.common.utils.StringUtil; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,7 +13,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; import javax.servlet.http.HttpServletRequest; -import java.util.Map; /** * 上传管理 @@ -25,19 +26,19 @@ public class UploadController { * * @author fzr * @param request 请求对象 - * @return AjaxResult + * @return AjaxResult */ @PostMapping("/image") - public AjaxResult image(HttpServletRequest request) { + public AjaxResult image(HttpServletRequest request) { MultipartFile multipartFile; try { multipartFile = ((MultipartRequest) request).getFile("file"); } catch (Exception e) { - return AjaxResult.failed("请正确选择上传图片"); + throw new OperateException("请正确选择上传图片!"); } if (multipartFile == null) { - return AjaxResult.failed("请选择上传图片"); + throw new OperateException("请选择上传图片!"); } String folder = "image"; @@ -46,8 +47,8 @@ public class UploadController { } StorageDriver storageDriver = new StorageDriver(); - Map map = storageDriver.upload(multipartFile, folder, AlbumEnum.IMAGE.getCode()); - return AjaxResult.success(map); + UploadFilesVo vo = storageDriver.upload(multipartFile, folder, AlbumEnum.IMAGE.getCode()); + return AjaxResult.success(vo); } } diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java index 8b1fb71d..61df4383 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java @@ -1,18 +1,18 @@ package com.mdd.front.controller; -import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.core.AjaxResult; -import com.mdd.common.exception.OperateException; import com.mdd.front.LikeFrontThreadLocal; import com.mdd.front.service.IUserService; -import com.mdd.front.vo.user.UserCenterVo; -import com.mdd.front.vo.user.UserInfoVo; +import com.mdd.front.validate.UserBindMobileValidate; +import com.mdd.front.validate.UserMnpMobileValidate; +import com.mdd.front.validate.UserPasswordValidate; +import com.mdd.front.validate.UserUpdateValidate; +import com.mdd.front.vo.users.UserCenterVo; +import com.mdd.front.vo.users.UserInfoVo; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Arrays; -import java.util.Map; -import java.util.regex.Pattern; /** * 用户管理表 @@ -52,15 +52,13 @@ public class UserController { * 编辑信息 * * @author fzr - * @param params 参数 + * @param updateValidate 参数 * @return AjaxResult */ @PostMapping("/edit") - public AjaxResult edit(@RequestBody Map params) { - Assert.notNull(params.get("field"), "field参数缺失"); - Assert.notNull(params.get("value"), "value参数缺失"); + public AjaxResult edit(@Validated @RequestBody UserUpdateValidate updateValidate) { Integer userId = LikeFrontThreadLocal.getUserId(); - iUserService.edit(params, userId); + iUserService.edit(updateValidate, userId); return AjaxResult.success(); } @@ -68,17 +66,13 @@ public class UserController { * 修改密码 * * @author fzr - * @param params 参数 + * @param passwordValidate 参数 * @return AjaxResult */ @PostMapping("/changePwd") - public AjaxResult changePwd(@RequestBody Map params) { - Assert.notNull(params.get("password"), "password参数缺失"); - if(!Pattern.matches("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$", params.get("password"))){ - throw new OperateException("密码必须是6-20字母+数字组合!"); - } + public AjaxResult changePwd(@Validated @RequestBody UserPasswordValidate passwordValidate) { Integer userId = LikeFrontThreadLocal.getUserId(); - iUserService.changePwd(params.get("password"), params.getOrDefault("oldPassword", null), userId); + iUserService.changePwd(passwordValidate.getPassword(), passwordValidate.getOldPassword(), userId); return AjaxResult.success(); } @@ -86,22 +80,13 @@ public class UserController { * 绑定手机号 * * @author fzr - * @param params 参数 + * @param mobileValidate 参数 * @return AjaxResult */ @PostMapping("/bindMobile") - public AjaxResult bindMobile(@RequestBody Map params) { - Assert.notNull(params.get("type"), "type参数缺失"); - Assert.notNull(params.get("mobile"), "mobile参数缺失"); - Assert.notNull(params.get("code"), "code参数缺失"); - boolean type = Arrays.asList("bind", "change").contains(params.get("type")); - Assert.isTrue(type, "type类型只能是[bind/change]"); - if(!Pattern.matches("^[1][3,4,5,6,7,8,9][0-9]{9}$", params.get("mobile"))){ - throw new OperateException("手机号格式不正确!"); - } - + public AjaxResult bindMobile(@Validated @RequestBody UserBindMobileValidate mobileValidate) { Integer userId = LikeFrontThreadLocal.getUserId(); - iUserService.bindMobile(params, userId); + iUserService.bindMobile(mobileValidate, userId); return AjaxResult.success(); } @@ -109,13 +94,12 @@ public class UserController { * 微信手机号 * * @author fzr - * @param params 参数 + * @param mobileValidate 参数 * @return AjaxResult */ @PostMapping("/mnpMobile") - public AjaxResult mnpMobile(@RequestBody Map params) { - Assert.notNull(params.get("code"), "code参数缺失"); - iUserService.mnpMobile(params.get("code").trim()); + public AjaxResult mnpMobile(@Validated @RequestBody UserMnpMobileValidate mobileValidate) { + iUserService.mnpMobile(mobileValidate.getCode().trim()); return AjaxResult.success(); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java b/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java index 3e37cb05..108a3edb 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java @@ -1,11 +1,11 @@ package com.mdd.front.service; import com.mdd.common.core.PageResult; -import com.mdd.front.validate.PageValidate; +import com.mdd.front.validate.commons.PageValidate; import com.mdd.front.vo.article.ArticleCateVo; import com.mdd.front.vo.article.ArticleCollectVo; import com.mdd.front.vo.article.ArticleDetailVo; -import com.mdd.front.vo.article.ArticleListVo; +import com.mdd.front.vo.article.ArticleListedVo; import java.util.List; @@ -31,7 +31,7 @@ public interface IArticleService { * @param userId 用户ID * @return PageResult */ - PageResult list(PageValidate pageValidate, Integer cid, Integer userId); + PageResult list(PageValidate pageValidate, Integer cid, Integer userId); /** * 文章详情 diff --git a/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java b/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java index f272b930..37e31ad2 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java @@ -1,8 +1,8 @@ package com.mdd.front.service; import com.mdd.common.core.PageResult; -import com.mdd.front.validate.PageValidate; -import com.mdd.front.vo.article.ArticleListVo; +import com.mdd.front.validate.commons.PageValidate; +import com.mdd.front.vo.article.ArticleListedVo; import java.util.List; import java.util.Map; @@ -61,5 +61,5 @@ public interface IIndexService { * @param params 搜索参数 * @return PageResult */ - PageResult search(PageValidate pageValidate, Map params); + PageResult search(PageValidate pageValidate, Map params); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/ILoginService.java b/server/like-front/src/main/java/com/mdd/front/service/ILoginService.java index 6a0a31fb..fca2141c 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/ILoginService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/ILoginService.java @@ -1,6 +1,7 @@ package com.mdd.front.service; -import com.mdd.front.validate.RegValidate; +import com.mdd.front.validate.UserRegisterValidate; +import com.mdd.front.vo.LoginTokenVo; import java.util.Map; @@ -13,45 +14,45 @@ public interface ILoginService { * 账号注册 * * @author fzr - * @param regValidate 参数 + * @param userRegisterValidate 参数 */ - void register(RegValidate regValidate); + void register(UserRegisterValidate userRegisterValidate); /** * 微信登录 * * @author fzr * @param params 参数 - * @return Map + * @return LoginTokenVo */ - Map mnpLogin(Map params); + LoginTokenVo mnpLogin(Map params); /** * 手机登录 * * @author fzr * @param params 参数 - * @return Map + * @return LoginTokenVo */ - Map mobileLogin(Map params); + LoginTokenVo mobileLogin(Map params); /** * 账号登录 * * @author fzr * @param params 参数 - * @return Map + * @return LoginTokenVo */ - Map accountLogin(Map params); + LoginTokenVo accountLogin(Map params); /** * 公众号登录 * * @author fzr * @param params 参数 - * @return Map + * @return LoginTokenVo */ - Map officeLogin(Map params); + LoginTokenVo officeLogin(Map params); /** * 公众号跳转url diff --git a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java index 37017229..34b45413 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java @@ -1,9 +1,9 @@ package com.mdd.front.service; -import com.mdd.front.vo.user.UserCenterVo; -import com.mdd.front.vo.user.UserInfoVo; - -import java.util.Map; +import com.mdd.front.validate.UserBindMobileValidate; +import com.mdd.front.validate.UserUpdateValidate; +import com.mdd.front.vo.users.UserCenterVo; +import com.mdd.front.vo.users.UserInfoVo; /** * 用户服务接口类 @@ -32,10 +32,10 @@ public interface IUserService { * 编辑信息 * * @author fzr - * @param params 参数 + * @param updateValidate 参数 * @param userId 用户ID */ - void edit(Map params, Integer userId); + void edit(UserUpdateValidate updateValidate, Integer userId); /** * 修改密码 @@ -51,10 +51,10 @@ public interface IUserService { * 绑定手机 * * @author fzr - * @param params 参数 + * @param mobileValidate 参数 * @param userId 用户ID */ - void bindMobile(Map params, Integer userId); + void bindMobile(UserBindMobileValidate mobileValidate, Integer userId); /** * 微信手机 diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java index e67f3334..8dda3d03 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java @@ -17,11 +17,11 @@ import com.mdd.common.utils.StringUtil; import com.mdd.common.utils.TimeUtil; import com.mdd.common.utils.UrlUtil; import com.mdd.front.service.IArticleService; -import com.mdd.front.validate.PageValidate; +import com.mdd.front.validate.commons.PageValidate; import com.mdd.front.vo.article.ArticleCateVo; import com.mdd.front.vo.article.ArticleCollectVo; import com.mdd.front.vo.article.ArticleDetailVo; -import com.mdd.front.vo.article.ArticleListVo; +import com.mdd.front.vo.article.ArticleListedVo; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -80,7 +80,7 @@ public class ArticleServiceImpl implements IArticleService { * @return PageResult */ @Override - public PageResult list(PageValidate pageValidate, Integer cid, Integer userId) { + public PageResult list(PageValidate pageValidate, Integer cid, Integer userId) { Integer pageNo = pageValidate.getPageNo(); Integer pageSize = pageValidate.getPageSize(); @@ -96,9 +96,9 @@ public class ArticleServiceImpl implements IArticleService { IPage
iPage = articleMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); List ids = new LinkedList<>(); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (Article article : iPage.getRecords()) { - ArticleListVo vo = new ArticleListVo(); + ArticleListedVo vo = new ArticleListedVo(); BeanUtils.copyProperties(article, vo); vo.setCollect(false); vo.setImage(UrlUtil.toAbsoluteUrl(article.getImage())); @@ -120,7 +120,7 @@ public class ArticleServiceImpl implements IArticleService { collects.add(c.getArticleId()); } - for (ArticleListVo vo : list) { + for (ArticleListedVo vo : list) { vo.setCollect(collects.contains(vo.getId())); } } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java index 1b8e9fcd..6357bf1b 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java @@ -17,8 +17,8 @@ import com.mdd.common.mapper.DecorateTabbarMapper; import com.mdd.common.mapper.setting.HotSearchMapper; import com.mdd.common.utils.*; import com.mdd.front.service.IIndexService; -import com.mdd.front.validate.PageValidate; -import com.mdd.front.vo.article.ArticleListVo; +import com.mdd.front.validate.commons.PageValidate; +import com.mdd.front.vo.article.ArticleListedVo; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -215,7 +215,7 @@ public class IndexServiceImpl implements IIndexService { * @param params 搜索参数 * @return PageResult */ - public PageResult search(PageValidate pageValidate, Map params) { + public PageResult search(PageValidate pageValidate, Map params) { Integer pageNo = pageValidate.getPageNo(); Integer pageSize = pageValidate.getPageSize(); @@ -227,12 +227,12 @@ public class IndexServiceImpl implements IIndexService { .like("t.title", params.get("keyword")) .orderByDesc(Arrays.asList("t.sort", "t.id")); - IPage iPage = articleMapper.selectJoinPage( + IPage iPage = articleMapper.selectJoinPage( new Page<>(pageNo, pageSize), - ArticleListVo.class, + ArticleListedVo.class, mpjQueryWrapper); - for (ArticleListVo vo : iPage.getRecords()) { + for (ArticleListedVo vo : iPage.getRecords()) { vo.setCollect(false); vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())); vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index 6bb84026..8d82586d 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -15,7 +15,8 @@ import com.mdd.common.mapper.user.UserMapper; import com.mdd.common.utils.*; import com.mdd.front.config.FrontConfig; import com.mdd.front.service.ILoginService; -import com.mdd.front.validate.RegValidate; +import com.mdd.front.validate.UserRegisterValidate; +import com.mdd.front.vo.LoginTokenVo; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; @@ -26,7 +27,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.LinkedHashMap; import java.util.Map; /** @@ -46,13 +46,13 @@ public class LoginServiceImpl implements ILoginService { * 注册账号 * * @author fzr - * @param regValidate 参数 + * @param userRegisterValidate 参数 */ @Override - public void register(RegValidate regValidate) { + public void register(UserRegisterValidate userRegisterValidate) { User model = userMapper.selectOne(new QueryWrapper() .select("id,sn,username") - .eq("username", regValidate.getUsername()) + .eq("username", userRegisterValidate.getUsername()) .eq("is_delete", 0) .last("limit 1")); @@ -60,16 +60,16 @@ public class LoginServiceImpl implements ILoginService { Integer sn = this.randMakeSn(); String salt = ToolsUtil.randomString(5); - String pwd = ToolsUtil.makeMd5(regValidate.getPassword()+salt); + String pwd = ToolsUtil.makeMd5(userRegisterValidate.getPassword()+salt); User user = new User(); user.setSn(sn); user.setNickname("用户"+sn); - user.setUsername(regValidate.getUsername()); + user.setUsername(userRegisterValidate.getUsername()); user.setPassword(pwd); user.setSalt(salt); user.setAvatar("/api/static/default_avatar.png"); - user.setChannel(regValidate.getClient()); + user.setChannel(userRegisterValidate.getClient()); user.setCreateTime(System.currentTimeMillis() / 1000); user.setUpdateTime(System.currentTimeMillis() / 1000); userMapper.insert(user); @@ -80,11 +80,11 @@ public class LoginServiceImpl implements ILoginService { * * @author fzr * @param params 参数 - * @return Map + * @return LoginTokenVo */ @Override @Transactional - public Map mnpLogin(Map params) { + public LoginTokenVo mnpLogin(Map params) { Assert.notNull(params.get("code"), "code参数缺失!"); String code = params.get("code"); String avatarUrl = params.getOrDefault("avatarUrl", "/api/static/default_avatar.png"); @@ -164,14 +164,13 @@ public class LoginServiceImpl implements ILoginService { String token = ToolsUtil.makeToken(); RedisUtil.set(FrontConfig.frontendTokenKey+token, userId, 7200); - String mobile = StringUtil.isNull(user.getMobile()) ? "" : user.getMobile(); - Map response = new LinkedHashMap<>(); - response.put("id", userId); - response.put("isBindMobile", !mobile.equals("")); - response.put("token", token); - return response; + LoginTokenVo vo = new LoginTokenVo(); + vo.setId(userId); + vo.setIsBindMobile(!mobile.equals("")); + vo.setToken(token); + return vo; } catch (WxErrorException e) { throw new OperateException(e.getError().getErrorCode() + ", " + e.getError().getErrorMsg()); } @@ -182,10 +181,10 @@ public class LoginServiceImpl implements ILoginService { * * @author fzr * @param params 参数 - * @return Map + * @return LoginTokenVo */ @Override - public Map mobileLogin(Map params) { + public LoginTokenVo mobileLogin(Map params) { Assert.notNull(params.get("mobile"), "mobile参数缺失!"); Assert.notNull(params.get("code"), "code参数缺失!"); String mobile = params.get("mobile"); @@ -199,7 +198,7 @@ public class LoginServiceImpl implements ILoginService { } // 删除验证码 - RedisUtil.del(GlobalConfig.redisSmsCode+"101:"+mobile); + RedisUtil.del(GlobalConfig.redisSmsCode+typeCode+":"+mobile); // 查询手机号 User user = userMapper.selectOne(new QueryWrapper() @@ -219,11 +218,11 @@ public class LoginServiceImpl implements ILoginService { String token = ToolsUtil.makeToken(); RedisUtil.set(FrontConfig.frontendTokenKey+token, user.getId(), 7200); - Map response = new LinkedHashMap<>(); - response.put("id", user.getId()); - response.put("isBindMobile", !user.getMobile().equals("")); - response.put("token", token); - return response; + LoginTokenVo vo = new LoginTokenVo(); + vo.setId(user.getId()); + vo.setIsBindMobile(!user.getMobile().equals("")); + vo.setToken(token); + return vo; } /** @@ -231,10 +230,10 @@ public class LoginServiceImpl implements ILoginService { * * @author fzr * @param params 参数 - * @return Map + * @return LoginTokenVo */ @Override - public Map accountLogin(Map params) { + public LoginTokenVo accountLogin(Map params) { Assert.notNull(params.get("username"), "username参数缺失!"); Assert.notNull(params.get("password"), "password参数缺失!"); String username = params.get("username"); @@ -259,21 +258,21 @@ public class LoginServiceImpl implements ILoginService { String token = ToolsUtil.makeToken(); RedisUtil.set(FrontConfig.frontendTokenKey+token, user.getId(), 7201); - Map response = new LinkedHashMap<>(); - response.put("id", user.getId()); - response.put("isBindMobile", !user.getMobile().equals("")); - response.put("token", token); - return response; + LoginTokenVo vo = new LoginTokenVo(); + vo.setId(user.getId()); + vo.setIsBindMobile(!user.getMobile().equals("")); + vo.setToken(token); + return vo; } /** * 公众号登录 * * @author fzr - * @return Map + * @return LoginTokenVo */ @Override - public Map officeLogin(Map params) { + public LoginTokenVo officeLogin(Map params) { Assert.notNull(params.get("code"), "code参数缺失!"); String code = params.get("code"); @@ -343,12 +342,11 @@ public class LoginServiceImpl implements ILoginService { String token = ToolsUtil.makeToken(); RedisUtil.set(FrontConfig.frontendTokenKey+token, userId, 7201); - Map response = new LinkedHashMap<>(); - response.put("id", userId); - response.put("isBindMobile", !user.getMobile().equals("")); - response.put("token", token); - - return response; + LoginTokenVo vo = new LoginTokenVo(); + vo.setId(user.getId()); + vo.setIsBindMobile(!user.getMobile().equals("")); + vo.setToken(token); + return vo; } catch (WxErrorException e) { throw new OperateException(e.getError().getErrorCode() + ", " + e.getError().getErrorMsg()); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java index e747055f..68b88684 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java @@ -16,8 +16,10 @@ import com.mdd.common.mapper.user.UserMapper; import com.mdd.common.utils.*; import com.mdd.front.LikeFrontThreadLocal; import com.mdd.front.service.IUserService; -import com.mdd.front.vo.user.UserCenterVo; -import com.mdd.front.vo.user.UserInfoVo; +import com.mdd.front.validate.UserBindMobileValidate; +import com.mdd.front.validate.UserUpdateValidate; +import com.mdd.front.vo.users.UserCenterVo; +import com.mdd.front.vo.users.UserInfoVo; import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -106,13 +108,13 @@ public class UserServiceImpl implements IUserService { * 编辑信息 * * @author fzr - * @param params 参数 + * @param updateValidate 参数 * @param userId 用户ID */ @Override - public void edit(Map params, Integer userId) { - String field = params.getOrDefault("field", "").trim(); - String value = params.getOrDefault("value", "").trim(); + public void edit(UserUpdateValidate updateValidate, Integer userId) { + String field = updateValidate.getField(); + String value = updateValidate.getValue(); switch (field) { case "avatar": @@ -202,14 +204,14 @@ public class UserServiceImpl implements IUserService { * 绑定手机 * * @author fzr - * @param params 参数 + * @param mobileValidate 参数 * @param userId 用户ID */ @Override - public void bindMobile(Map params, Integer userId) { - String type = params.getOrDefault("type", ""); - String mobile = params.getOrDefault("mobile", ""); - String code = params.getOrDefault("code", "").toLowerCase(); + public void bindMobile(UserBindMobileValidate mobileValidate, Integer userId) { + String type = mobileValidate.getType(); + String mobile = mobileValidate.getMobile(); + String code = mobileValidate.getCode().toLowerCase(); // 校验验证码 int typeCode = type.equals("bind") ? NoticeEnum.SMS_BIND_MOBILE_CODE.getCode() : NoticeEnum.SMS_CHANGE_MOBILE_CODE.getCode() ; diff --git a/server/like-front/src/main/java/com/mdd/front/validate/ArticleCollectValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/ArticleCollectValidate.java new file mode 100644 index 00000000..ed24704e --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/validate/ArticleCollectValidate.java @@ -0,0 +1,21 @@ +package com.mdd.front.validate; + +import com.mdd.common.validator.annotation.IDMust; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 文章收藏参数 + */ +@Data +public class ArticleCollectValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "articleId参数缺失") + @IDMust(message = "articleId参数必须大于0") + private Integer articleId; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/validate/UserBindMobileValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/UserBindMobileValidate.java new file mode 100644 index 00000000..73718cd8 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/validate/UserBindMobileValidate.java @@ -0,0 +1,33 @@ +package com.mdd.front.validate; + +import com.mdd.common.validator.annotation.StringContains; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * 绑定或修改手机参数 + */ +@Data +public class UserBindMobileValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "type参数缺失") + @StringContains(values = {"bind", "change"}) + private String type; + + @NotNull(message = "mobile参数缺失") + @NotEmpty(message = "手机号不能为空") + @Length(min = 11, max = 11, message = "手机号只能为11位") + @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误") + private String mobile; + + @NotNull(message = "code参数缺失") + private String code; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/validate/UserMnpMobileValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/UserMnpMobileValidate.java new file mode 100644 index 00000000..30c04688 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/validate/UserMnpMobileValidate.java @@ -0,0 +1,19 @@ +package com.mdd.front.validate; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 获取微信手机号参数 + */ +@Data +public class UserMnpMobileValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "code参数缺失") + private String code; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/validate/UserPasswordValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/UserPasswordValidate.java new file mode 100644 index 00000000..1e4a1597 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/validate/UserPasswordValidate.java @@ -0,0 +1,24 @@ +package com.mdd.front.validate; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * 用户修改密码参数 + */ +@Data +public class UserPasswordValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "password参数缺失") + @Pattern(message = "密码必须是6-20字母+数字组合!", regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$") + private String password; + + @NotNull(message = "oldPassword参数缺失") + private String oldPassword; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/validate/RegValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/UserRegisterValidate.java similarity index 94% rename from server/like-front/src/main/java/com/mdd/front/validate/RegValidate.java rename to server/like-front/src/main/java/com/mdd/front/validate/UserRegisterValidate.java index 760a0a4e..f28a0122 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/RegValidate.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/UserRegisterValidate.java @@ -13,7 +13,7 @@ import java.io.Serializable; * 注册参数类 */ @Data -public class RegValidate implements Serializable { +public class UserRegisterValidate implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-front/src/main/java/com/mdd/front/validate/UserUpdateValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/UserUpdateValidate.java new file mode 100644 index 00000000..18c4e364 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/validate/UserUpdateValidate.java @@ -0,0 +1,24 @@ +package com.mdd.front.validate; + +import com.mdd.common.validator.annotation.StringContains; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 用户更新参数 + */ +@Data +public class UserUpdateValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull(message = "field参数缺失") + @StringContains(values = {"avatar", "username", "nickname", "sex"}) + private String field; + + @NotNull(message = "value参数缺失") + private String value; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/validate/PageValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/commons/PageValidate.java similarity index 94% rename from server/like-front/src/main/java/com/mdd/front/validate/PageValidate.java rename to server/like-front/src/main/java/com/mdd/front/validate/commons/PageValidate.java index 31bdb2b9..b72dfe63 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/PageValidate.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/commons/PageValidate.java @@ -1,4 +1,4 @@ -package com.mdd.front.validate; +package com.mdd.front.validate.commons; import lombok.Data; diff --git a/server/like-front/src/main/java/com/mdd/front/validate/SmsValidate.java b/server/like-front/src/main/java/com/mdd/front/validate/commons/SmsValidate.java similarity index 94% rename from server/like-front/src/main/java/com/mdd/front/validate/SmsValidate.java rename to server/like-front/src/main/java/com/mdd/front/validate/commons/SmsValidate.java index e9bf8e88..395172de 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/SmsValidate.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/commons/SmsValidate.java @@ -1,4 +1,4 @@ -package com.mdd.front.validate; +package com.mdd.front.validate.commons; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/server/like-front/src/main/java/com/mdd/front/vo/LoginCodesVo.java b/server/like-front/src/main/java/com/mdd/front/vo/LoginCodesVo.java new file mode 100644 index 00000000..f9492ef6 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/vo/LoginCodesVo.java @@ -0,0 +1,17 @@ +package com.mdd.front.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 公众号跳转url + */ +@Data +public class LoginCodesVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String url; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/vo/LoginTokenVo.java b/server/like-front/src/main/java/com/mdd/front/vo/LoginTokenVo.java new file mode 100644 index 00000000..8c0ea1f3 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/vo/LoginTokenVo.java @@ -0,0 +1,19 @@ +package com.mdd.front.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 系统登录Vo + */ +@Data +public class LoginTokenVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; + private Boolean isBindMobile; + private String token; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListVo.java b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListedVo.java similarity index 86% rename from server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListVo.java rename to server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListedVo.java index 49fbc7cd..45524dc5 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListedVo.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; @Data -public class ArticleListVo implements Serializable { +public class ArticleListedVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-front/src/main/java/com/mdd/front/vo/user/UserCenterVo.java b/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java similarity index 92% rename from server/like-front/src/main/java/com/mdd/front/vo/user/UserCenterVo.java rename to server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java index fb369df1..b7265980 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/user/UserCenterVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/users/UserCenterVo.java @@ -1,4 +1,4 @@ -package com.mdd.front.vo.user; +package com.mdd.front.vo.users; import lombok.Data; diff --git a/server/like-front/src/main/java/com/mdd/front/vo/user/UserInfoVo.java b/server/like-front/src/main/java/com/mdd/front/vo/users/UserInfoVo.java similarity index 96% rename from server/like-front/src/main/java/com/mdd/front/vo/user/UserInfoVo.java rename to server/like-front/src/main/java/com/mdd/front/vo/users/UserInfoVo.java index 21eb0b12..6b6b5529 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/user/UserInfoVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/users/UserInfoVo.java @@ -1,4 +1,4 @@ -package com.mdd.front.vo.user; +package com.mdd.front.vo.users; import lombok.Data;