From 932d46c6eef906f7553b85dbe8c4e624dfc23d21 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Thu, 16 Mar 2023 10:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/controller/ArticleController.java   | 44 ++------------
 .../mdd/front/controller/IndexController.java | 42 --------------
 .../mdd/front/controller/LoginController.java | 56 ------------------
 .../mdd/front/controller/PcController.java    | 25 +-------
 .../front/controller/UploadController.java    |  7 ---
 .../mdd/front/controller/UserController.java  | 58 ++++---------------
 .../com/mdd/front/service/IIndexService.java  |  1 +
 .../com/mdd/front/service/IPcService.java     |  5 +-
 .../com/mdd/front/service/IUserService.java   | 12 +++-
 .../front/service/impl/UserServiceImpl.java   | 11 ++--
 10 files changed, 35 insertions(+), 226 deletions(-)

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 d9e8b72a..5a1167a7 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
@@ -29,12 +29,6 @@ public class ArticleController {
     @Resource
     IArticleService iArticleService;
 
-    /**
-     * 文章分类
-     *
-     * @author fzr
-     * @return AjaxResult<List<ArticleCateVo>>
-     */
     @NotLogin
     @GetMapping("/category")
     @ApiOperation(value="文章分类")
@@ -43,80 +37,52 @@ public class ArticleController {
         return AjaxResult.success(list);
     }
 
-    /**
-     * 文章列表
-     *
-     * @author fzr
-     * @return AjaxResult<PageResult<ArticleListVo>>
-     */
     @NotLogin
     @GetMapping("/list")
     @ApiOperation(value="文章列表")
     public AjaxResult<PageResult<ArticleListedVo>> list(@Validated PageValidate pageValidate,
                                                         @Validated ArticleSearchValidate searchValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         PageResult<ArticleListedVo> list = iArticleService.list(userId, pageValidate, searchValidate);
         return AjaxResult.success(list);
     }
 
-    /**
-     * 文章详情
-     *
-     * @author fzr
-     * @return AjaxResult<ArticleDetailVo>
-     */
     @NotLogin
     @GetMapping("/detail")
     @ApiOperation(value="文章详情")
     public AjaxResult<ArticleDetailVo> detail(@Validated @IDMust() @RequestParam("id") Integer id) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         ArticleDetailVo vo = iArticleService.detail(id, userId);
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 收藏列表
-     *
-     * @author fzr
-     * @param pageValidate 分页参数
-     * @return AjaxResult<PageResult<ArticleCollectVo>>
-     */
     @GetMapping("/collectList")
     @ApiOperation(value="收藏列表")
     public AjaxResult<PageResult<ArticleCollectVo>> collect(@Validated PageValidate pageValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         PageResult<ArticleCollectVo> list = iArticleService.collect(pageValidate, userId);
         return AjaxResult.success(list);
     }
 
-    /**
-     * 收藏加入
-     *
-     * @author fzr
-     * @param collectValidate 参数
-     * @return AjaxResult<Object>
-     */
     @PostMapping("/collectAdd")
     @ApiOperation(value="收藏加入")
     public AjaxResult<Object> addCollect(@Validated @RequestBody ArticleCollectValidate collectValidate) {
         Integer articleId = collectValidate.getArticleId();
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         iArticleService.addCollect(articleId, userId);
         return AjaxResult.success();
     }
 
-    /**
-     * 收藏取消
-     *
-     * @author fzr
-     * @param collectValidate 参数
-     * @return AjaxResult<Object>
-     */
     @PostMapping("/collectCancel")
     @ApiOperation(value="收藏取消")
     public AjaxResult<Object> 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 383a04de..3469e0d8 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
@@ -3,7 +3,6 @@ package com.mdd.front.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mdd.common.aop.NotLogin;
 import com.mdd.common.core.AjaxResult;
-import com.mdd.common.core.PageResult;
 import com.mdd.common.entity.notice.NoticeRecord;
 import com.mdd.common.enums.NoticeEnum;
 import com.mdd.common.exception.OperateException;
@@ -14,9 +13,7 @@ import com.mdd.common.util.StringUtils;
 import com.mdd.common.util.ToolUtils;
 import com.mdd.common.validator.annotation.IDMust;
 import com.mdd.front.service.IIndexService;
-import com.mdd.front.validate.common.PageValidate;
 import com.mdd.front.validate.common.SmsValidate;
-import com.mdd.front.vo.article.ArticleListedVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
@@ -38,12 +35,6 @@ public class IndexController {
     @Resource
     IIndexService iIndexService;
 
-    /**
-     * 首页
-     *
-     * @author fzr
-     * @return AjaxResult<Map<String, Object>>
-     */
     @NotLogin
     @GetMapping("/index")
     @ApiOperation(value="首页数据")
@@ -52,13 +43,6 @@ public class IndexController {
         return AjaxResult.success(detail);
     }
 
-    /**
-     * 装修
-     *
-     * @author fzr
-     * @param id 主键
-     * @return AjaxResult<Map<String, Object>>
-     */
     @NotLogin
     @GetMapping("/decorate")
     @ApiOperation(value="装修数据")
@@ -67,12 +51,6 @@ public class IndexController {
         return AjaxResult.success(detail);
     }
 
-    /**
-     * 配置
-     *
-     * @author fzr
-     * @return AjaxResult<Map<String, Object>>
-     */
     @NotLogin
     @GetMapping("/config")
     @ApiOperation(value="公共配置")
@@ -81,13 +59,6 @@ public class IndexController {
         return AjaxResult.success(map);
     }
 
-    /**
-     * 协议
-     *
-     * @author fzr
-     * @param type 类型 service=服务协议,privacy=隐私协议
-     * @return AjaxResult<Map<String, String>>
-     */
     @NotLogin
     @GetMapping("/policy")
     @ApiOperation(value="政策协议")
@@ -96,12 +67,6 @@ public class IndexController {
         return AjaxResult.success(map);
     }
 
-    /**
-     * 热搜
-     *
-     * @author fzr
-     * @return AjaxResult<List<String>>
-     */
     @NotLogin
     @GetMapping("/hotSearch")
     @ApiOperation(value="热门搜索")
@@ -110,13 +75,6 @@ public class IndexController {
         return AjaxResult.success(list);
     }
 
-    /**
-     * 发送短信
-     *
-     * @author fzr
-     * @param smsValidate 参数
-     * @return AjaxResult<Object>
-     */
     @NotLogin
     @PostMapping("/sendSms")
     @ApiOperation(value="发送短信")
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 0b1a5585..ebe42ae0 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
@@ -26,13 +26,6 @@ public class LoginController {
     @Resource
     ILoginService iLoginService;
 
-    /**
-     * 注册账号
-     *
-     * @author fzr
-     * @param registerValidate 注册参数
-     * @return AjaxResult<Object>
-     */
     @NotLogin
     @PostMapping("/register")
     @ApiOperation(value="注册账号")
@@ -45,13 +38,6 @@ public class LoginController {
         return AjaxResult.success();
     }
 
-    /**
-     * 账号登录
-     *
-     * @author fzr
-     * @param loginPwdValidate 登录参数
-     * @return AjaxResult<LoginTokenVo>
-     */
     @NotLogin
     @PostMapping("/accountLogin")
     @ApiOperation(value="账号登录")
@@ -64,13 +50,6 @@ public class LoginController {
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 手机登录
-     *
-     * @author fzr
-     * @param loginPhoneValidate 登录参数
-     * @return AjaxResult<LoginTokenVo>
-     */
     @NotLogin
     @PostMapping("/mobileLogin")
     @ApiOperation(value="手机登录")
@@ -83,13 +62,6 @@ public class LoginController {
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 微信登录
-     *
-     * @author fzr
-     * @param loginCodeValidate 登录参数
-     * @return AjaxResult<LoginTokenVo>
-     */
     @NotLogin
     @PostMapping("/mnpLogin")
     @ApiOperation(value="微信登录")
@@ -101,13 +73,6 @@ public class LoginController {
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 公众号登录
-     *
-     * @author fzr
-     * @param loginCodeValidate 登录参数
-     * @return AjaxResult<LoginTokenVo>
-     */
     @NotLogin
     @PostMapping("/oaLogin")
     @ApiOperation(value="公众号登录")
@@ -119,13 +84,6 @@ public class LoginController {
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 公众号链接
-     *
-     * @author fzr
-     * @param url 跳转链接
-     * @return AjaxResult<LoginCodesVo>
-     */
     @NotLogin
     @GetMapping("/oaCodeUrl")
     @ApiOperation(value="公众号链接")
@@ -135,13 +93,6 @@ public class LoginController {
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 扫码链接
-     *
-     * @author fzr
-     * @param session session
-     * @return AjaxResult<LoginUrlsVo>
-     */
     @NotLogin
     @GetMapping("/scanCodeUrl")
     @ApiOperation(value="PC扫码链接")
@@ -152,13 +103,6 @@ public class LoginController {
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 扫码登录
-     *
-     * @author fzr
-     * @param loginScanValidate 扫码参数
-     * @return AjaxResult<Object>
-     */
     @NotLogin
     @PostMapping("/scanLogin")
     @ApiOperation(value="PC扫码登录")
diff --git a/server/like-front/src/main/java/com/mdd/front/controller/PcController.java b/server/like-front/src/main/java/com/mdd/front/controller/PcController.java
index 3cd5f1d8..e9f968cf 100644
--- a/server/like-front/src/main/java/com/mdd/front/controller/PcController.java
+++ b/server/like-front/src/main/java/com/mdd/front/controller/PcController.java
@@ -27,12 +27,6 @@ public class PcController {
     @Resource
     IPcService iPcService;
 
-    /**
-     * 主页
-     *
-     * @author cjh
-     * @return AjaxResult<Map<String, Object>>
-     */
     @NotLogin
     @GetMapping("/index")
     @ApiOperation(value="主页数据")
@@ -41,11 +35,6 @@ public class PcController {
         return AjaxResult.success(index);
     }
 
-    /**
-     * 配置
-     * @author cjh
-     * @return AjaxResult<Map<String, Object>>
-     */
     @NotLogin
     @GetMapping("/getConfig")
     @ApiOperation(value="公共配置")
@@ -54,12 +43,6 @@ public class PcController {
         return AjaxResult.success(config);
     }
 
-    /**
-     * 资讯中心
-     *
-     * @author fzr
-     * @return AjaxResult<List<PcArticleCenterVo>>
-     */
     @NotLogin
     @GetMapping("/articleCenter")
     @ApiOperation(value="资讯中心")
@@ -68,18 +51,12 @@ public class PcController {
         return AjaxResult.success(list);
     }
 
-    /**
-     * 文章详情
-     *
-     * @author fzr
-     * @param id 文章主键
-     * @return AjaxResult<PcArticleDetailVo>
-     */
     @NotLogin
     @GetMapping("/articleDetail")
     @ApiOperation(value="文章详情")
     public AjaxResult<PcArticleDetailVo> articleDetail(@Validated @IDMust() @RequestParam("id") Integer id) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         PcArticleDetailVo vo = iPcService.articleDetail(id, userId);
         return AjaxResult.success(vo);
     }
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 e0614e56..6b6a3893 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
@@ -22,13 +22,6 @@ import javax.servlet.http.HttpServletRequest;
 @Api(tags = "上传管理")
 public class UploadController {
 
-    /**
-     * 上传图片
-     *
-     * @author fzr
-     * @param request 请求对象
-     * @return AjaxResult<UploadFilesVo>
-     */
     @NotLogin
     @PostMapping("/image")
     @ApiOperation(value="上传图片")
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 a7268494..e59037de 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
@@ -26,101 +26,63 @@ public class UserController {
     @Resource
     IUserService iUserService;
 
-    /**
-     * 个人中心
-     *
-     * @author fzr
-     * @return AjaxResult<UserCenterVo>
-     */
     @GetMapping("/center")
     @ApiOperation(value="个人中心")
     public AjaxResult<UserCenterVo> center() {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         UserCenterVo vo = iUserService.center(userId);
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 个人信息
-     *
-     * @author fzr
-     * @return AjaxResult<UserInfoVo>
-     */
     @GetMapping("/info")
     @ApiOperation(value="个人信息")
     public AjaxResult<UserInfoVo> info() {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         UserInfoVo vo = iUserService.info(userId);
         return AjaxResult.success(vo);
     }
 
-    /**
-     * 编辑信息
-     *
-     * @author fzr
-     * @param updateValidate 参数
-     * @return AjaxResult<Object>
-     */
     @PostMapping("/edit")
     @ApiOperation(value="编辑信息")
     public AjaxResult<Object> edit(@Validated @RequestBody UserUpdateValidate updateValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         iUserService.edit(updateValidate, userId);
         return AjaxResult.success();
     }
 
-    /**
-     * 修改密码
-     *
-     * @author fzr
-     * @param passwordValidate 参数
-     * @return AjaxResult<Object>
-     */
     @PostMapping("/changePwd")
     @ApiOperation(value="修改密码")
     public AjaxResult<Object> changePwd(@Validated @RequestBody UserChangePwdValidate passwordValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         iUserService.changePwd(passwordValidate.getPassword(), passwordValidate.getOldPassword(), userId);
         return AjaxResult.success();
     }
 
-    /**
-     * 忘记密码
-     *
-     * @author fzr
-     * @param userForgetPwdValidate 参数
-     * @return AjaxResult<Object>
-     */
     @NotLogin
     @PostMapping("/forgotPwd")
     @ApiOperation(value="忘记密码")
     public AjaxResult<Object> forgotPwd(@Validated @RequestBody UserForgetPwdValidate userForgetPwdValidate) {
-        iUserService.forgotPwd(userForgetPwdValidate);
+        String password = userForgetPwdValidate.getPassword();
+        String mobile = userForgetPwdValidate.getMobile();
+        String code = userForgetPwdValidate.getCode();
+
+        iUserService.forgotPwd(password, mobile, code);
         return AjaxResult.success();
     }
 
-    /**
-     * 绑定手机号
-     *
-     * @author fzr
-     * @param mobileValidate 参数
-     * @return AjaxResult<Object>
-     */
     @PostMapping("/bindMobile")
     @ApiOperation(value="绑定手机")
     public AjaxResult<Object> bindMobile(@Validated @RequestBody UserPhoneBindValidate mobileValidate) {
         Integer userId = LikeFrontThreadLocal.getUserId();
+
         iUserService.bindMobile(mobileValidate, userId);
         return AjaxResult.success();
     }
 
-    /**
-     * 微信手机号
-     *
-     * @author fzr
-     * @param mobileValidate 参数
-     * @return AjaxResult<Object>
-     */
     @PostMapping("/mnpMobile")
     @ApiOperation(value="微信手机号")
     public AjaxResult<Object> mnpMobile(@Validated @RequestBody UserPhoneMnpValidate mobileValidate) {
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 ff753231..8b3520c9 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
@@ -24,6 +24,7 @@ public interface IIndexService {
      * 装修
      *
      * @author fzr
+     * @param id 装修ID
      * @return Map<String, Object>
      */
     Map<String, Object> decorate(Integer id);
diff --git a/server/like-front/src/main/java/com/mdd/front/service/IPcService.java b/server/like-front/src/main/java/com/mdd/front/service/IPcService.java
index 2f111eb3..f0a481bb 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/IPcService.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/IPcService.java
@@ -25,7 +25,7 @@ public interface IPcService {
     /**
      * 资讯中心
      *
-     * @authro fzr
+     * @author fzr
      * @return PcArticleCenterVo
      */
     List<PcArticleCenterVo> articleCenter();
@@ -34,7 +34,8 @@ public interface IPcService {
      * 文章详情
      *
      * @author fzr
-     * @param id 文章主键
+     * @param id 文章ID
+     * @param userId 用户ID
      * @return PcArticleDetailVo
      */
     PcArticleDetailVo articleDetail(Integer id, Integer userId);
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 bca93170..6f6a22cf 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
@@ -15,7 +15,7 @@ public interface IUserService {
      * 个人中心
      *
      * @author fzr
-     * @param userId 用户
+     * @param userId 用户ID
      * @return UserCenterVo
      */
     UserCenterVo center(Integer userId);
@@ -48,7 +48,15 @@ public interface IUserService {
      */
     void changePwd(String password, String oldPassword, Integer userId);
 
-    void forgotPwd(UserForgetPwdValidate userForgetPwdValidate);
+    /**
+     * 忘记密码
+     *
+     * @author fzr
+     * @param password 新密码
+     * @param mobile 手机号
+     * @param code 验证码
+     */
+    void forgotPwd(String password, String mobile, String code);
 
     /**
      * 绑定手机
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 9427e404..7b341297 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
@@ -204,14 +204,13 @@ public class UserServiceImpl implements IUserService {
     /**
      * 忘记密码
      *
-     * @param userForgetPwdValidate
+     * @author fzr
+     * @param password 新密码
+     * @param mobile 手机号
+     * @param code 验证码
      */
     @Override
-    public void forgotPwd(UserForgetPwdValidate userForgetPwdValidate) {
-        String mobile = userForgetPwdValidate.getMobile();
-        String code = userForgetPwdValidate.getCode();
-        String password = userForgetPwdValidate.getPassword();
-
+    public void forgotPwd(String password, String mobile, String code) {
         // 校验验证码
         int sceneCode = NoticeEnum.FORGOT_PASSWORD_CODE.getCode();
         if (!NoticeCheck.verify(sceneCode, code)) {